diff --git a/base/deploy b/base/deploy
index 038468503470..cd45d2cccfc7 100644
--- a/base/deploy
+++ b/base/deploy
@@ -11,7 +11,7 @@ deploy_base_prep()
 
 deploy_base_sw()
 {
-  deploy_pkg comp cms+webtools-base 0.1.21-comp
+  deploy_pkg comp cms+webtools-base 0.1.21-comp2
 }
 
 deploy_base_post()
diff --git a/das/deploy b/das/deploy
index 829590535ca0..1a5dcdcd50aa 100644
--- a/das/deploy
+++ b/das/deploy
@@ -15,7 +15,7 @@ deploy_das_prep()
 
 deploy_das_sw()
 {
-  deploy_pkg comp cms+das 1.0.1
+  deploy_pkg comp cms+das 1.0.1-comp
   perl -p -i -e "s|{ROOT}|$root|" $project_config/analytics_cfg.py
 }
 
diff --git a/dbs/deploy b/dbs/deploy
index 41343b975344..db709c5c2a14 100644
--- a/dbs/deploy
+++ b/dbs/deploy
@@ -15,7 +15,7 @@ deploy_dbs_prep()
 
 deploy_dbs_sw()
 {
-  deploy_pkg -a dbs/DBSSecrets.py -l dbs comp cms+dbs3 3.0.13
+  deploy_pkg -a dbs/DBSSecrets.py -l dbs comp cms+dbs3 3.0.13-comp
   cp -p $project_config/DBS-${variant}.py $project_config/DBS.py
 }
 
diff --git a/dbsweb/deploy b/dbsweb/deploy
index 8aa5a3f1a38c..1ac156b517c6 100644
--- a/dbsweb/deploy
+++ b/dbsweb/deploy
@@ -12,7 +12,7 @@ deploy_dbsweb_prep()
 deploy_dbsweb_sw()
 {
   app=$root/current/apps/dbs-web
-  deploy_pkg comp cms+dbs-web V06_00_52-comp
+  deploy_pkg comp cms+dbs-web V06_00_52-comp2
   perl -p -i -e "s|{ROOT}|$root|g" $project_config/DBSDD.conf
   setgroup ug+r,g-w,o-rwx _config $project_config/DBSDD.conf
   chmod g-w,o-rwx $project_config/DBSDD.conf
diff --git a/dqmgui/deploy b/dqmgui/deploy
index 603351e8e6c1..d02233b796ea 100644
--- a/dqmgui/deploy
+++ b/dqmgui/deploy
@@ -33,7 +33,7 @@ deploy_dqmgui_prep()
 
 deploy_dqmgui_sw()
 {
-  deploy_pkg comp cms+dqmgui 6.1.2
+  deploy_pkg comp cms+dqmgui 6.1.2-comp
 }
 
 deploy_dqmgui_post()
diff --git a/filemover/deploy b/filemover/deploy
index 23ba6b9a2dc9..e709f13d2342 100644
--- a/filemover/deploy
+++ b/filemover/deploy
@@ -16,7 +16,7 @@ deploy_filemover_prep()
 
 deploy_filemover_sw()
 {
-  deploy_pkg comp cms+filemover 1.1.1
+  deploy_pkg comp cms+filemover 1.1.1-comp
   case $variant in dev ) suff="-dev";; preprod ) suff="-testbed";; * ) suff="";; esac
   perl -p -i -e "s|cmsweb.cern.ch/|cmsweb${suff}.cern.ch/|g" $project_config/fm_config.py
 }
diff --git a/overview/deploy b/overview/deploy
index e942ada8be6e..f7d26d00ccf5 100644
--- a/overview/deploy
+++ b/overview/deploy
@@ -11,7 +11,7 @@ deploy_overview_prep()
 
 deploy_overview_sw()
 {
-  deploy_pkg -a overview/dbparam.py comp cms+overview 6.0.7-comp
+  deploy_pkg -a overview/dbparam.py comp cms+overview 6.0.7-comp2
 }
 
 deploy_overview_post()
diff --git a/phedex/deploy b/phedex/deploy
index b93d4506fc52..9f2642099ade 100644
--- a/phedex/deploy
+++ b/phedex/deploy
@@ -11,9 +11,9 @@ deploy_phedex_prep()
 
 deploy_phedex_sw()
 {
-  deploy_pkg comp cms+PHEDEX-datasvc 2.2.8
-  deploy_pkg comp cms+PHEDEX-webapp 1.3.3
-  deploy_pkg -a phedex/DBParam -a phedex/DBGraph comp cms+PHEDEX-web 4.1.9
+  deploy_pkg comp cms+PHEDEX-datasvc 2.2.8-comp
+  deploy_pkg comp cms+PHEDEX-webapp 1.3.3-comp
+  deploy_pkg -a phedex/DBParam -a phedex/DBGraph comp cms+PHEDEX-web 4.1.9-comp
 
   (set -e
    for app in PHEDEX-{web,webapp,datasvc}; do
diff --git a/reqmgr/deploy b/reqmgr/deploy
index 45144384fbe7..b670bafa265c 100644
--- a/reqmgr/deploy
+++ b/reqmgr/deploy
@@ -50,7 +50,7 @@ deploy_reqmgr_sw()
       deploy_pkg \
         -a dmwm-service-cert.pem:wmcore/dmwm-service-cert.pem \
         -a dmwm-service-key.pem:wmcore/dmwm-service-key.pem \
-        -a ReqMgrSecrets.py:reqmgr/ReqMgrSecrets${secrets}.py comp cms+reqmgr 0.8.11-comp2
+        -a ReqMgrSecrets.py:reqmgr/ReqMgrSecrets${secrets}.py comp cms+reqmgr 0.8.11-comp3
 
       if grep -rq "replace me" $project_auth; then
         note "WARNING: replace certificates in $project_auth with real ones"
diff --git a/t0datasvc/deploy b/t0datasvc/deploy
index 2e6616f49e76..b6bd72debf73 100644
--- a/t0datasvc/deploy
+++ b/t0datasvc/deploy
@@ -12,7 +12,7 @@ deploy_t0datasvc_prep()
 
 deploy_t0datasvc_sw()
 {
-  deploy_pkg -a t0datasvc/connect comp cms+T0DataSvc 5.0.4-comp
+  deploy_pkg -a t0datasvc/connect comp cms+T0DataSvc 5.0.4-comp2
 }
 
 deploy_t0datasvc_post()
diff --git a/t0mon/deploy b/t0mon/deploy
index a7754d9d1605..6c99ec750a71 100644
--- a/t0mon/deploy
+++ b/t0mon/deploy
@@ -11,7 +11,7 @@ deploy_t0mon_prep()
 
 deploy_t0mon_sw()
 {
-  deploy_pkg comp cms+T0Mon 4.2.11-comp
+  deploy_pkg comp cms+T0Mon 4.2.11-comp2
 }
 
 deploy_t0mon_post()
diff --git a/workqueue/deploy b/workqueue/deploy
index 6c379221ef81..9c6da545c675 100644
--- a/workqueue/deploy
+++ b/workqueue/deploy
@@ -16,7 +16,7 @@ deploy_workqueue_sw()
   deploy_pkg \
     -a dmwm-service-cert.pem:wmcore/dmwm-service-cert.pem \
     -a dmwm-service-key.pem:wmcore/dmwm-service-key.pem \
-    comp cms+workqueue 0.8.17-comp
+    comp cms+workqueue 0.8.17-comp2
 
   if grep -rq "replace me" $project_auth; then
     note "WARNING: replace certificates in $project_auth with real ones"