diff --git a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
index 06bdbaee63228..a630f909a4f6e 100644
--- a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
+++ b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPSRPAlignment_byPCL_v0_prompt": {}
+        "CTPPSRPAlignment_byPCL_v1_prompt": {}
     }, 
     "inputTag": "CTPPSRPAlignment_real_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prod.json b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prod.json
index d5c5077599827..2d27a0eca835e 100644
--- a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prod.json
+++ b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prod.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPSRPAlignment_byPCL_v0_prompt": {}
+        "CTPPSRPAlignment_byPCL_v1_prompt": {}
     }, 
     "inputTag": "CTPPSRPAlignment_real_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
index a7824a34acf00..23fc587ef7bb0 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
+        "CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
     }, 
     "inputTag": "PPSDiamondSampicCalibration_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json
index 8da3acdced8b5..2b82f95681279 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
+        "CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
     }, 
     "inputTag": "PPSDiamondSampicCalibration_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prep.json b/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prep.json
deleted file mode 100644
index bf491e1704628..0000000000000
--- a/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prep.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
-    "destinationTags": {
-        "SiStripApvGainAfterAbortGap_PCL_v0_hlt": {}, 
-        "SiStripApvGainAfterAbortGap_PCL_v0_prompt": {}
-    }, 
-    "inputTag": "SiStripApvGainAAG_pcl",
-    "since": null, 
-    "userText": "T0 PCL Upload for SiStrip Gains AfterAbortGap calib. (prep)"
-}
diff --git a/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prod.json b/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prod.json
deleted file mode 100644
index b5453d9ab6632..0000000000000
--- a/CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prod.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
-    "destinationTags": {
-        "SiStripApvGainAfterAbortGap_PCL_v0_hlt": {}, 
-        "SiStripApvGainAfterAbortGap_PCL_v0_prompt": {}
-    }, 
-    "inputTag": "SiStripApvGainAAG_pcl",
-    "since": null, 
-    "userText": "T0 PCL Upload for SiStrip Gains AfterAbortGap calib. (prod)"
-}
diff --git a/CondFormats/Common/test/DropBoxMetadataReader.py b/CondFormats/Common/test/DropBoxMetadataReader.py
index 1ccc826ae3b01..2d48c5754648f 100644
--- a/CondFormats/Common/test/DropBoxMetadataReader.py
+++ b/CondFormats/Common/test/DropBoxMetadataReader.py
@@ -38,7 +38,6 @@
                                     'SiStripApvGainRcd',
                                     'TrackerAlignmentRcd',
                                     'TrackerAlignmentHGRcd',
-                                    'SiStripApvGainRcdAfterAbortGap',
                                     'SiStripApvGainRcdAAG',
                                     'EcalPedestalsRcd',
                                     "LumiCorrectionsRcd",
@@ -47,7 +46,8 @@
                                     "SiPixelQualityFromDbRcd_other",
                                     "SiPixelLorentzAngleRcd",
                                     "CTPPSRPAlignmentCorrectionsDataRcd",
-                                    "PPSTimingCalibrationRcd"
+                                    "PPSTimingCalibrationRcd_HPTDC",
+                                    "PPSTimingCalibrationRcd_SAMPIC"
                                     ) # same strings as fType
                                   )
 
diff --git a/CondFormats/Common/test/ProduceDropBoxMetadata.py b/CondFormats/Common/test/ProduceDropBoxMetadata.py
index 161f3356453b2..d102b7ca826d0 100644
--- a/CondFormats/Common/test/ProduceDropBoxMetadata.py
+++ b/CondFormats/Common/test/ProduceDropBoxMetadata.py
@@ -53,14 +53,12 @@ def encodeJsonInString(filename):
 #SiStripApvGainRcd
 SiStripApvGainRcd_prod_str = encodeJsonInString("SiStripApvGainRcd_prod.json")
 SiStripApvGainRcd_multirun_prod_str = encodeJsonInString("SiStripApvGainRcd_multirun_prod.json") 
-SiStripApvGainRcdAfterAbortGap_prod_str = encodeJsonInString("SiStripApvGainRcdAfterAbortGap_prod.json") # can be removed, once 92x deployed
-SiStripApvGainRcdAAG_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_prod.json") # will take over
+SiStripApvGainRcdAAG_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_prod.json")
 SiStripApvGainRcdAAG_multirun_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_multirun_prod.json")
 
 SiStripApvGainRcd_prep_str = encodeJsonInString("SiStripApvGainRcd_prep.json")
 SiStripApvGainRcd_multirun_prep_str = encodeJsonInString("SiStripApvGainRcd_multirun_prep.json")
-SiStripApvGainRcdAfterAbortGap_prep_str = encodeJsonInString("SiStripApvGainRcdAfterAbortGap_prep.json") # can be removed, once 92x deployed
-SiStripApvGainRcdAAG_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_prep.json") # will take over
+SiStripApvGainRcdAAG_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_prep.json")
 SiStripApvGainRcdAAG_multirun_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_multirun_prep.json")
 
 #SiPixelAli
@@ -165,13 +163,7 @@ def encodeJsonInString(filename):
                                                                prodMetaData        = cms.untracked.string(SiPixelAliHGRcd_prod_str),
                                                                prepMetaData        = cms.untracked.string(SiPixelAliHGRcd_prep_str),
                                                                ),
-                                                      cms.PSet(record              = cms.untracked.string('SiStripApvGainRcdAfterAbortGap'), # can be removed, once 92x deployed...
-                                                               Source              = cms.untracked.string("AlcaHarvesting"),
-                                                               FileClass           = cms.untracked.string("ALCA"),
-                                                               prodMetaData        = cms.untracked.string(SiStripApvGainRcdAfterAbortGap_prod_str),
-                                                               prepMetaData        = cms.untracked.string(SiStripApvGainRcdAfterAbortGap_prep_str),
-                                                               ),
-                                                      cms.PSet(record              = cms.untracked.string('SiStripApvGainRcdAAG'), # ... will take over
+                                                      cms.PSet(record              = cms.untracked.string('SiStripApvGainRcdAAG'),
                                                                Source              = cms.untracked.string("AlcaHarvesting"),
                                                                FileClass           = cms.untracked.string("ALCA"),
                                                                prodMetaData        = cms.untracked.string(SiStripApvGainRcdAAG_prod_str),