diff --git a/elements/svc-map/extra-data.d/10-merge-svc-map-files b/elements/svc-map/extra-data.d/10-merge-svc-map-files
index 32885e6c..23fd8c38 100755
--- a/elements/svc-map/extra-data.d/10-merge-svc-map-files
+++ b/elements/svc-map/extra-data.d/10-merge-svc-map-files
@@ -81,7 +81,9 @@ def main():
                               " service name." % (err, element))
                         sys.exit(1)
 
-    write_data_to_file(service_names, os.path.join("/tmp", 'svc-map-services'))
+    write_data_to_file(
+        service_names,
+        os.path.join(os.environ['TMP_MOUNT_PATH'], 'tmp', 'svc-map-services'))
 
 
 if __name__ == "__main__":
diff --git a/elements/svc-map/extra-data.d/11-copy-svc-map-file b/elements/svc-map/extra-data.d/11-copy-svc-map-file
index 5fb5f118..88a0c56e 100755
--- a/elements/svc-map/extra-data.d/11-copy-svc-map-file
+++ b/elements/svc-map/extra-data.d/11-copy-svc-map-file
@@ -2,4 +2,4 @@
 set -eux
 set -o pipefail
 
-sudo install -D -o root -g root -m 0644 /tmp/svc-map-services "$TMP_MOUNT_PATH/usr/share/svc-map/services"
+sudo install -D -o root -g root -m 0644 "$TMP_MOUNT_PATH/tmp/svc-map-services" "$TMP_MOUNT_PATH/usr/share/svc-map/services"