diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml
index e9cbadd03f7..7eb9f29dc9d 100644
--- a/.github/workflows/cypress-e2e.yml
+++ b/.github/workflows/cypress-e2e.yml
@@ -23,7 +23,7 @@ jobs:
       npmVersion: ${{ steps.versions.outputs.npmVersion }}
     strategy:
       matrix:
-        server-versions: ['master']
+        server-versions: ['stable32']
 
     steps:
       - name: Checkout server
@@ -40,16 +40,11 @@ jobs:
           ref: ${{ matrix.server-versions }}
           path: apps/viewer
 
-      - name: Register assistant Git reference
-        run: |
-          assistant_app_ref="$(if [ "${{ matrix.server-versions }}" = "master" ]; then echo -n "main"; else echo -n "${{ matrix.server-versions }}"; fi)"
-          echo "assistant_app_ref=$assistant_app_ref" >> $GITHUB_ENV
-
       - name: Checkout assistant
         uses: actions/checkout@v4.1.1
         with:
           repository: nextcloud/assistant
-          ref: '${{ env.assistant_app_ref }}'
+          ref: main
           path: apps/assistant
 
       - name: Checkout app
diff --git a/src/components/Assistant.vue b/src/components/Assistant.vue
index b63092c03c9..49d4881b572 100644
--- a/src/components/Assistant.vue
+++ b/src/components/Assistant.vue
@@ -503,10 +503,10 @@ ul {
 }
 
 .icon-status--success {
-	color: var(--color-success);
+	color: var(--color-element-success);
 }
 
 .icon-status--failed {
-	color: var(--color-error);
+	color: var(--color-element-error);
 }
 </style>
diff --git a/src/nodes/Callout.vue b/src/nodes/Callout.vue
index f066768fcd2..4bff7cfe7a4 100644
--- a/src/nodes/Callout.vue
+++ b/src/nodes/Callout.vue
@@ -91,22 +91,22 @@ export default {
 	// Info (default) variables
 	&,
 	&--info {
-		--callout-border: var(--color-info, #006aa3);
+		--callout-border: var(--color-element-info, #006aa3);
 	}
 
 	// Warn variables
 	&--warn {
-		--callout-border: var(--color-warning);
+		--callout-border: var(--color-element-warning);
 	}
 
 	// Error variables
 	&--error {
-		--callout-border: var(--color-error);
+		--callout-border: var(--color-element-error);
 	}
 
 	// Success variables
 	&--success {
-		--callout-border: var(--color-success);
+		--callout-border: var(--color-element-success);
 	}
 }
 </style>