diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 34e970bea..89cc38c83 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -716,6 +716,8 @@ echo ""
 echo "Updating dockers to $NEWVERSION."
 if [ $is_airgap -eq 0 ]; then
   airgap_update_dockers
+  update_centos_repo
+  yum clean all
 else
   update_registry
   update_docker_containers "soup"
@@ -737,10 +739,6 @@ preupgrade_changes_2.3.50_repo
 if [ "$UPGRADESALT" == "1" ]; then
   echo "Upgrading Salt"
   # Update the repo files so it can actually upgrade
-  if [ $is_airgap -eq 0 ]; then
-    update_centos_repo
-    yum clean all
-  fi
   upgrade_salt
 fi
 
diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls
index cff28fb4a..f5d94e241 100644
--- a/salt/repo/client/init.sls
+++ b/salt/repo/client/init.sls
@@ -16,8 +16,9 @@ airgap_repo:
   pkgrepo.managed:
     - humanname: Airgap Repo
     - baseurl: https://{{ MANAGER }}/repo
-    - gpgcheck: 1
+    - gpgcheck: 0
     - sslverify: 0
+
 {% endif %}
 
 # from airgap and common