diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 727fcdf538ad..3c0dc1127c87 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -798,8 +798,7 @@ linux64-asan/debug:
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
-    # Disabled because bug 1516114 shows up much more often
-    # use-pgo: true
+    use-pgo: true
     attributes:
         shippable: true
         enable-full-crashsymbols: true
@@ -811,9 +810,7 @@ linux64-shippable/opt:
         type: shippable
     treeherder:
         platform: linux64-shippable/opt
-        # Bug 1516114
-        symbol: B
-        # symbol: Bpgo(B)
+        symbol: Bpgo(B)
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 9000
@@ -828,8 +825,7 @@ linux64-shippable/opt:
         secrets: true
         tooltool-downloads: public
         need-xvfb: true
-        # Bug 1516114
-        # mozconfig-variant: profile-use
+        mozconfig-variant: profile-use
     toolchains:
         - linux64-binutils
         - linux64-clang
diff --git a/taskcluster/ci/generate-profile/kind.yml b/taskcluster/ci/generate-profile/kind.yml
index fc488f9f0a60..beee18503817 100644
--- a/taskcluster/ci/generate-profile/kind.yml
+++ b/taskcluster/ci/generate-profile/kind.yml
@@ -22,7 +22,7 @@ job-defaults:
         tier: 1
 
 jobs:
-    linux64/pgo:
+    linux64-shippable/opt:
         description: "Linux64 Profile Generation"
         shipping-phase: build
         shipping-product: firefox
@@ -30,7 +30,7 @@ jobs:
             product: firefox
             job-name: linux64-profile
         treeherder:
-            platform: linux64/pgo
+            platform: linux64-shippable/opt
         worker-type: aws-provisioner-v1/gecko-{level}-b-linux
         worker:
             max-run-time: 1200
diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml
index 526c0b9187d8..d1127b24d040 100644
--- a/taskcluster/ci/instrumented-build/kind.yml
+++ b/taskcluster/ci/instrumented-build/kind.yml
@@ -22,12 +22,12 @@ job-defaults:
         tier: 1
 
 jobs:
-    linux64/pgo:
+    linux64-shippable/opt:
         description: "Linux64 Instrumented"
         shipping-phase: build
         shipping-product: firefox
         treeherder:
-            platform: linux64/pgo
+            platform: linux64-shippable/opt
         worker-type: aws-provisioner-v1/gecko-{level}-b-linux
         worker:
             max-run-time: 7200