diff --git a/MetaPluginDemo.xcodeproj/project.pbxproj b/MetaPluginDemo.xcodeproj/project.pbxproj
index d72ba9a..0f433c5 100755
--- a/MetaPluginDemo.xcodeproj/project.pbxproj
+++ b/MetaPluginDemo.xcodeproj/project.pbxproj
@@ -25,10 +25,9 @@
 		4C63AAEF288193F40046A02E /* MetaPluginDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AAEE288193F40046A02E /* MetaPluginDemoUITests.swift */; };
 		4C63AAF1288193F40046A02E /* MetaPluginDemoUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AAF0288193F40046A02E /* MetaPluginDemoUITestsLaunchTests.swift */; };
 		4C63AB012881991C0046A02E /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AB002881991C0046A02E /* Credentials.swift */; };
-		4CB10A1B2B860F1400624BC6 /* webid-gateway.de_2024.11.02.cer in Resources */ = {isa = PBXBuildFile; fileRef = 4CB10A172B860F1400624BC6 /* webid-gateway.de_2024.11.02.cer */; };
-		4CB10A1C2B860F1400624BC6 /* test.webid-solutions.de_2024.02.27.cer in Resources */ = {isa = PBXBuildFile; fileRef = 4CB10A182B860F1400624BC6 /* test.webid-solutions.de_2024.02.27.cer */; };
 		4CB10A1D2B860F1400624BC6 /* test.webid-solutions.de_2025.02.22.cer in Resources */ = {isa = PBXBuildFile; fileRef = 4CB10A192B860F1400624BC6 /* test.webid-solutions.de_2025.02.22.cer */; };
-		4CB10A1E2B860F1400624BC6 /* webid-gateway.de_2023.12.01.cer in Resources */ = {isa = PBXBuildFile; fileRef = 4CB10A1A2B860F1400624BC6 /* webid-gateway.de_2023.12.01.cer */; };
+		CFAABA0D2D5CB1D400BEBCE5 /* test.webid-solutions.de-valid_until_2026.02.21.cer in Resources */ = {isa = PBXBuildFile; fileRef = CFAABA0C2D5CB1D400BEBCE5 /* test.webid-solutions.de-valid_until_2026.02.21.cer */; };
+		CFAABA0F2D5CB1F800BEBCE5 /* webid-gateway.de_valid_until_2025.10.17.cer in Resources */ = {isa = PBXBuildFile; fileRef = CFAABA0E2D5CB1F800BEBCE5 /* webid-gateway.de_valid_until_2025.10.17.cer */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -68,11 +67,10 @@
 		4C63AAEE288193F40046A02E /* MetaPluginDemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaPluginDemoUITests.swift; sourceTree = "<group>"; };
 		4C63AAF0288193F40046A02E /* MetaPluginDemoUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaPluginDemoUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		4C63AB002881991C0046A02E /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
-		4CB10A172B860F1400624BC6 /* webid-gateway.de_2024.11.02.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "webid-gateway.de_2024.11.02.cer"; sourceTree = "<group>"; };
-		4CB10A182B860F1400624BC6 /* test.webid-solutions.de_2024.02.27.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "test.webid-solutions.de_2024.02.27.cer"; sourceTree = "<group>"; };
 		4CB10A192B860F1400624BC6 /* test.webid-solutions.de_2025.02.22.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "test.webid-solutions.de_2025.02.22.cer"; sourceTree = "<group>"; };
-		4CB10A1A2B860F1400624BC6 /* webid-gateway.de_2023.12.01.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "webid-gateway.de_2023.12.01.cer"; sourceTree = "<group>"; };
 		C8B6F1CC2BB460890023D2BF /* init.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = init.sh; sourceTree = "<group>"; };
+		CFAABA0C2D5CB1D400BEBCE5 /* test.webid-solutions.de-valid_until_2026.02.21.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "test.webid-solutions.de-valid_until_2026.02.21.cer"; sourceTree = "<group>"; };
+		CFAABA0E2D5CB1F800BEBCE5 /* webid-gateway.de_valid_until_2025.10.17.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "webid-gateway.de_valid_until_2025.10.17.cer"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -108,10 +106,9 @@
 		4C40CAB5291A6EA000D76323 /* Certificates */ = {
 			isa = PBXGroup;
 			children = (
-				4CB10A182B860F1400624BC6 /* test.webid-solutions.de_2024.02.27.cer */,
 				4CB10A192B860F1400624BC6 /* test.webid-solutions.de_2025.02.22.cer */,
-				4CB10A1A2B860F1400624BC6 /* webid-gateway.de_2023.12.01.cer */,
-				4CB10A172B860F1400624BC6 /* webid-gateway.de_2024.11.02.cer */,
+				CFAABA0C2D5CB1D400BEBCE5 /* test.webid-solutions.de-valid_until_2026.02.21.cer */,
+				CFAABA0E2D5CB1F800BEBCE5 /* webid-gateway.de_valid_until_2025.10.17.cer */,
 			);
 			path = Certificates;
 			sourceTree = "<group>";
@@ -301,14 +298,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CB10A1B2B860F1400624BC6 /* webid-gateway.de_2024.11.02.cer in Resources */,
 				4CB10A1D2B860F1400624BC6 /* test.webid-solutions.de_2025.02.22.cer in Resources */,
 				4C40CABD291A718D00D76323 /* LICENSE.txt in Resources */,
 				4C63AADA288193F40046A02E /* LaunchScreen.storyboard in Resources */,
-				4CB10A1C2B860F1400624BC6 /* test.webid-solutions.de_2024.02.27.cer in Resources */,
+				CFAABA0D2D5CB1D400BEBCE5 /* test.webid-solutions.de-valid_until_2026.02.21.cer in Resources */,
 				4C63AAD7288193F40046A02E /* Assets.xcassets in Resources */,
-				4CB10A1E2B860F1400624BC6 /* webid-gateway.de_2023.12.01.cer in Resources */,
 				4C63AAD5288193F10046A02E /* Main.storyboard in Resources */,
+				CFAABA0F2D5CB1F800BEBCE5 /* webid-gateway.de_valid_until_2025.10.17.cer in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MetaPluginDemo/Certificates/test.webid-solutions.de-valid_until_2026.02.21.cer b/MetaPluginDemo/Certificates/test.webid-solutions.de-valid_until_2026.02.21.cer
new file mode 100644
index 0000000..49e398c
Binary files /dev/null and b/MetaPluginDemo/Certificates/test.webid-solutions.de-valid_until_2026.02.21.cer differ
diff --git a/MetaPluginDemo/Certificates/test.webid-solutions.de_2024.02.27.cer b/MetaPluginDemo/Certificates/test.webid-solutions.de_2024.02.27.cer
deleted file mode 100755
index bbdb1c5..0000000
Binary files a/MetaPluginDemo/Certificates/test.webid-solutions.de_2024.02.27.cer and /dev/null differ
diff --git a/MetaPluginDemo/Certificates/webid-gateway.de_2023.12.01.cer b/MetaPluginDemo/Certificates/webid-gateway.de_2023.12.01.cer
deleted file mode 100755
index 5393eee..0000000
Binary files a/MetaPluginDemo/Certificates/webid-gateway.de_2023.12.01.cer and /dev/null differ
diff --git a/MetaPluginDemo/Certificates/webid-gateway.de_2024.11.02.cer b/MetaPluginDemo/Certificates/webid-gateway.de_valid_until_2025.10.17.cer
old mode 100755
new mode 100644
similarity index 56%
rename from MetaPluginDemo/Certificates/webid-gateway.de_2024.11.02.cer
rename to MetaPluginDemo/Certificates/webid-gateway.de_valid_until_2025.10.17.cer
index e2ca689..465fc98
Binary files a/MetaPluginDemo/Certificates/webid-gateway.de_2024.11.02.cer and b/MetaPluginDemo/Certificates/webid-gateway.de_valid_until_2025.10.17.cer differ
diff --git a/MetaPluginDemo/EWebIdEnv.swift b/MetaPluginDemo/EWebIdEnv.swift
index 6906190..fd2a860 100755
--- a/MetaPluginDemo/EWebIdEnv.swift
+++ b/MetaPluginDemo/EWebIdEnv.swift
@@ -21,15 +21,14 @@ class EWebIDEnv {
         }
     }
 
-    // one environment (here PRODUCTION) has to have an actionIdPrefix= nil, all other environments != nil
     static let TEST = WebIDEnv(
         uri: URLComponents(string: "https://test.webid-solutions.de")!,
         username: Credentials.demoUsernameTest,
         apiKey: Credentials.demoApiKeyTest,
         name: "Test",
         pinningCerts: EWebIDEnv.getPinningCerts(certResourceNames: [
-            "test.webid-solutions.de_2025.02.22",
-            "test.webid-solutions.de_2024.02.27"
+            "test.webid-solutions.de-valid_until_2026.02.21",
+            "test.webid-solutions.de_2025.02.22"
         ])
     )
     
@@ -39,8 +38,7 @@ class EWebIDEnv {
         apiKey: Credentials.demoApiKeyProduction,
         name: "",
         pinningCerts: EWebIDEnv.getPinningCerts(certResourceNames: [
-            "webid-gateway.de_2024.11.02",
-            "webid-gateway.de_2023.12.01"
+            "webid-gateway.de_valid_until_2025.10.17"
         ])
     )