diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0d1c0181d..d8eaf3fe57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,6 @@ version: 2.1
 orbs:
   win: circleci/windows@2.3.0
   go: circleci/go@1.7.0
-  slack: circleci/slack@4.4.2
 
 workflows:
   version: 2
@@ -18,7 +17,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - amd64_test_nightly:
           requires:
             - amd64_build
@@ -26,8 +25,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - amd64_integration:
           requires:
             - amd64_build
@@ -35,7 +33,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - amd64_integration_nightly:
           requires:
             - amd64_build
@@ -43,8 +41,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - amd64_e2e_subs:
           requires:
             - amd64_build
@@ -52,7 +49,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - amd64_e2e_subs_nightly:
           requires:
             - amd64_build
@@ -60,8 +57,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - arm64_build
       - arm64_test:
           requires:
@@ -70,7 +66,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - arm64_test_nightly:
           requires:
             - arm64_build
@@ -78,8 +74,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - arm64_integration:
           requires:
             - arm64_build
@@ -87,7 +82,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - arm64_integration_nightly:
           requires:
             - arm64_build
@@ -95,8 +90,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - arm64_e2e_subs:
           requires:
             - arm64_build
@@ -104,7 +98,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - arm64_e2e_subs_nightly:
           requires:
             - arm64_build
@@ -112,8 +106,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - mac_amd64_build
       - mac_amd64_test:
           requires:
@@ -122,7 +115,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - mac_amd64_test_nightly:
           requires:
             - mac_amd64_build
@@ -130,8 +123,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - mac_amd64_integration:
           requires:
             - mac_amd64_build
@@ -139,7 +131,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - mac_amd64_integration_nightly:
           requires:
             - mac_amd64_build
@@ -147,8 +139,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       - mac_amd64_e2e_subs:
           requires:
             - mac_amd64_build
@@ -156,7 +147,7 @@ workflows:
             branches:
               ignore:
                 - /rel\/.*/
-                - /hotfix\/.*/
+                - /pull\/[0-9]+/
       - mac_amd64_e2e_subs_nightly:
           requires:
             - mac_amd64_build
@@ -164,8 +155,7 @@ workflows:
             branches:
               only:
                 - /rel\/.*/
-                - /hotfix\/.*/
-          context: slack-secrets
+                - /pull\/[0-9]+/
       #- windows_x64_build
 
 commands:
@@ -413,9 +403,6 @@ jobs:
           result_subdir: amd64-nightly
           no_output_timeout: 45m
       - upload_coverage
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   amd64_integration:
     machine:
@@ -433,7 +420,7 @@ jobs:
   amd64_integration_nightly:
     machine:
       image: ubuntu-2004:202104-01
-    resource_class: medium
+    resource_class: large
     parallelism: 4
     environment:
       E2E_TEST_FILTER: "GO"
@@ -442,9 +429,6 @@ jobs:
       - generic_integration:
           result_subdir: amd64-integrationnightly
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   amd64_e2e_subs:
     machine:
@@ -469,9 +453,6 @@ jobs:
       - generic_integration:
           result_subdir: amd64-e2e_subs_nightly
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   arm64_build:
     machine:
@@ -507,9 +488,6 @@ jobs:
           result_subdir: arm64-nightly
           no_output_timeout: 45m
       - upload_coverage
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   arm64_integration:
     machine:
@@ -528,7 +506,7 @@ jobs:
   arm64_integration_nightly:
     machine:
       image: ubuntu-2004:202101-01
-    resource_class: arm.medium
+    resource_class: arm.large
     parallelism: 4
     environment:
       E2E_TEST_FILTER: "GO"
@@ -538,9 +516,6 @@ jobs:
       - generic_integration:
           result_subdir: arm64-integration-nightly
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   arm64_e2e_subs:
     machine:
@@ -567,9 +542,6 @@ jobs:
       - generic_integration:
           result_subdir: arm64-e2e_subs-nightly
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   mac_amd64_build:
     macos:
@@ -615,9 +587,6 @@ jobs:
           circleci_home: /Users/distiller
           no_output_timeout: 45m
       - upload_coverage
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   mac_amd64_integration:
     macos:
@@ -638,7 +607,7 @@ jobs:
   mac_amd64_integration_nightly:
     macos:
       xcode: 12.0.1
-    resource_class: medium
+    resource_class: large
     parallelism: 4
     environment:
       E2E_TEST_FILTER: "GO"
@@ -650,9 +619,6 @@ jobs:
           result_subdir: mac-amd64-integration-nightly
           circleci_home: /Users/distiller
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   mac_amd64_e2e_subs:
     macos:
@@ -683,9 +649,6 @@ jobs:
           result_subdir: mac-amd64-e2e_subs-nightly
           circleci_home: /Users/distiller
           no_output_timeout: 45m
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
 
   windows_x64_build:
     executor: