diff --git a/taskcluster/fenix_taskgraph/manifests/fenix_candidates.yml b/taskcluster/fenix_taskgraph/manifests/fenix_candidates.yml
index ba28a76a8f..9a2719e7cb 100644
--- a/taskcluster/fenix_taskgraph/manifests/fenix_candidates.yml
+++ b/taskcluster/fenix_taskgraph/manifests/fenix_candidates.yml
@@ -66,22 +66,22 @@ mapping:
         description: "Android package for arm64-v8a"
         pretty_name: fenix-${version}.${locale}.android-arm64-v8a.apk
         destinations:
-            - ${dated_path}-fenix-${version}-android-arm64-v8a
+            - ${folder_prefix}fenix-${version}-android-arm64-v8a
     armeabi-v7a/target.apk:
         <<: *default
         description: "Android package for armeabi-v7a"
         pretty_name: fenix-${version}.${locale}.android-armeabi-v7a.apk
         destinations:
-            - ${dated_path}-fenix-${version}-android-armeabi-v7a
+            - ${folder_prefix}fenix-${version}-android-armeabi-v7a
     x86/target.apk:
         <<: *default
         description: "Android package for x86"
         pretty_name: fenix-${version}.${locale}.android-x86.apk
         destinations:
-            - ${dated_path}-fenix-${version}-android-x86
+            - ${folder_prefix}fenix-${version}-android-x86
     x86_64/target.apk:
         <<: *default
         description: "Android package for x86_64"
         pretty_name: fenix-${version}.${locale}.android-x86_64.apk
         destinations:
-            - ${dated_path}-fenix-${version}-android-x86_64
+            - ${folder_prefix}fenix-${version}-android-x86_64
diff --git a/taskcluster/fenix_taskgraph/util/scriptworker.py b/taskcluster/fenix_taskgraph/util/scriptworker.py
index a3f57090ff..019031b9e0 100644
--- a/taskcluster/fenix_taskgraph/util/scriptworker.py
+++ b/taskcluster/fenix_taskgraph/util/scriptworker.py
@@ -177,13 +177,10 @@ def generate_beetmover_artifact_map(config, job, **kwargs):
         "s3_bucket_paths",
         job["label"],
         **{
-            "build-type": job['attributes']['build-type']
+            "build-type": job["attributes"]["build-type"]
         }
     )
 
-
-    
-
     for locale, dep in sorted(itertools.product(locales, dependencies)):
         paths = dict()
         for filename in map_config["mapping"]:
@@ -274,13 +271,17 @@ def generate_beetmover_artifact_map(config, job, **kwargs):
 
         version = read_version_file()
         upload_date = datetime.fromtimestamp(config.params["build_date"])
-        dated_path = upload_date.strftime("%Y/%m/%Y-%m-%d-%H-%M-%S")
+        
+        if job["attributes"]["build-type"] == "nightly":
+            folder_prefix = upload_date.strftime("%Y/%m/%Y-%m-%d-%H-%M-%S-")
+        else:
+            folder_prefix = f"{version}/android/"
 
         kwargs.update(
             {
                 "locale": locale,
                 "version": version,
-                "dated_path": dated_path
+                "folder_prefix": folder_prefix
             }
         )
         kwargs.update(**platforms)