diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
index 08e50713a..bb80f4164 100644
--- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
@@ -1,8 +1,8 @@
 ---
 - name: continuous-deployment-ocis-onlyoffice-rolling
   server:
-    server_type: cx21
-    image: ubuntu-22.04
+    server_type: cx22
+    image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
       - owncloud-ocis@drone.owncloud.com
diff --git a/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml
index 910073ebe..465b3eebe 100644
--- a/deployments/continuous-deployment-config/ocis_full/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml
@@ -1,8 +1,8 @@
 ---
 - name: continuous-deployment-ocis-rolling
   server:
-    server_type: cx21
-    image: ubuntu-22.04
+    server_type: cx22
+    image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
       - owncloud-ocis@drone.owncloud.com
diff --git a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
index cdb39b4b6..15a6b2d2a 100644
--- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
@@ -1,8 +1,8 @@
 ---
 - name: continuous-deployment-ocis-s3-rolling
   server:
-    server_type: cx21
-    image: ubuntu-22.04
+    server_type: cx22
+    image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
       - owncloud-ocis@drone.owncloud.com
diff --git a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
index be3969669..e382659e1 100644
--- a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
@@ -1,8 +1,8 @@
 ---
 - name: continuous-deployment-ocis-keycloak-rolling
   server:
-    server_type: cx21
-    image: ubuntu-22.04
+    server_type: cx22
+    image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
       - owncloud-ocis@drone.owncloud.com
diff --git a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
index c5fe383e8..dbfcda23d 100644
--- a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
@@ -1,8 +1,8 @@
 ---
 - name: continuous-deployment-ocis-ldap-rolling
   server:
-    server_type: cx21
-    image: ubuntu-22.04
+    server_type: cx22
+    image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
       - owncloud-ocis@drone.owncloud.com