diff --git a/taskcluster/taskgraph/loader/push_apk.py b/taskcluster/taskgraph/loader/push_apk.py
index a0e9085b84c1..bbae09521c97 100644
--- a/taskcluster/taskgraph/loader/push_apk.py
+++ b/taskcluster/taskgraph/loader/push_apk.py
@@ -39,9 +39,11 @@ def get_dependent_loaded_tasks(config, loaded_tasks):
     ]
 
     # TODO Bug 1368484: Activate aarch64 once ready
-    non_aarch64_tasks = [
+    # TODO Bug 1490502: Activate x86-64 once ready
+    non_shipping_tasks = [
         task for task in android_tasks
-        if 'aarch64' not in task.attributes.get('build_platform', '')
+        if 'aarch64' not in task.attributes.get('build_platform', '') and
+           'x86_64' not in task.attributes.get('build_platform', '')
     ]
 
-    return non_aarch64_tasks
+    return non_shipping_tasks
diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index f61dff33dbf6..6044ae8598ff 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -474,6 +474,7 @@ def target_tasks_nightly_fennec(full_task_graph, parameters, graph_config):
                         'android-api-16-nightly',
                         'android-nightly',
                         'android-x86-nightly',
+                        'android-x86_64-nightly',
                         ):
             if not task.attributes.get('nightly', False):
                 return False