diff --git a/macro/PWG/common/production/config.json b/macro/PWG/common/production/config.json
index d9c7dd029676cbc64a0ede7e03f6e5ce56d7afaf..defec9f9a92b4d8b9b1ebbb496fbcc86e1b41ae1 100644
--- a/macro/PWG/common/production/config.json
+++ b/macro/PWG/common/production/config.json
@@ -62,8 +62,8 @@
         "x": 0.0,
         "y": 0.0,
         "zFocus": -44.0,
-        "sigmaX": 0.1,
-        "sigmaY": 0.1
+        "sigmaX": 0.06,
+        "sigmaY": 0.06
       },
       "angle": {
         "x": 0.0,
@@ -82,24 +82,25 @@
     },
     "geometry": {
       "baseSetup": "sis100_electron",
-      "#magneticField": {
-        "tag": "v18a",
+      "magneticField": {
+        "tag": "v22c",
         "scale": 1.0,
         "position": {
           "x": 0.0,
           "y": 0.0,
-          "z": 40.0
+          "z": 0.0
         }
       },
       "subsystems": {
-        "magnet":   "v21a",
-        "pipe":     "v21d",
+        "magnet":   "v22a",
+        "pipe":     "v21d:v21h",
 	"mvd":      "v20d_tr",
-        "sts":      "v21e",
-        "rich":     "v21a",
+        "sts":      "v22d",
+        "rich":     "v23a",
         "trd":      "v20b_1e",
         "tof":      "v21a_1e",
-        "psd":      "v22a",
+        "psd":      "v23a",
+	"fsd":      "v23h",
         "platform": "v22b"
       }
     },
diff --git a/macro/PWG/common/production/config_ci.json.in b/macro/PWG/common/production/config_ci.json.in
index 4dcb3faaacdc21a10b761d7da69c6dd42943aacb..6a0e3c03767e11086764064539042c7f7d714f50 100644
--- a/macro/PWG/common/production/config_ci.json.in
+++ b/macro/PWG/common/production/config_ci.json.in
@@ -62,8 +62,8 @@
         "x": 0.0,
         "y": 0.0,
         "zFocus": -44.0,
-        "sigmaX": 0.1,
-        "sigmaY": 0.1
+        "sigmaX": 0.06,
+        "sigmaY": 0.06
       },
       "angle": {
         "x": 0.0,
@@ -82,24 +82,25 @@
     },
     "geometry": {
       "baseSetup": "sis100_electron",
-      "#magneticField": {
-        "tag": "v18a",
+      "magneticField": {
+        "tag": "v22c",
         "scale": 1.0,
         "position": {
           "x": 0.0,
           "y": 0.0,
-          "z": 40.0
+          "z": 0.0
         }
       },
       "subsystems": {
-        "magnet":   "v21a",
-        "pipe":     "v21d",
+        "magnet":   "v22a",
+        "pipe":     "v21d:v21h",
 	"mvd":      "v20d_tr",
-        "sts":      "v21e",
-        "rich":     "v21a",
+        "sts":      "v22d",
+        "rich":     "v23a",
         "trd":      "v20b_1e",
         "tof":      "v21a_1e",
-        "psd":      "v22a",
+        "psd":      "v23a",
+	"fsd":      "v23h",
         "platform": "v22b"
       }
     },