diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 54e57c92..9bb23048 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -75,7 +75,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -93,7 +93,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
 
   local_multitenancy_integration:
     runs-on: ubuntu-latest
@@ -121,7 +121,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -141,7 +141,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
 
   saas_integration:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index baf0dfdf..3a01198a 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -91,7 +91,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
 
   local_multitenancy_integration:
     runs-on: ubuntu-latest
@@ -119,7 +119,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -139,7 +139,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
 
   saas_integration:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b2e7fbe4..8b909fe2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -72,7 +72,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose.yaml -f docker/docker-compose-modeler.yaml down
 
   local_multitenancy_integration:
     runs-on: ubuntu-latest
@@ -100,7 +100,7 @@ jobs:
 
       - name: Set up Docker Compose
         run: |
-          docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
+          docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d
 
       - name: Run Integration Tests
         run: |
@@ -120,7 +120,7 @@ jobs:
 
       - name: Cleanup
         if: always()
-        run: docker-compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
+        run: docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down
 
   saas_integration:
     runs-on: ubuntu-latest
diff --git a/src/oauth/lib/OAuthProvider.ts b/src/oauth/lib/OAuthProvider.ts
index dea642f6..4ed27369 100644
--- a/src/oauth/lib/OAuthProvider.ts
+++ b/src/oauth/lib/OAuthProvider.ts
@@ -281,7 +281,11 @@ export class OAuthProvider implements IOAuthProvider {
 	}) {
 		const body = `${this.addAudienceIfNeeded(
 			audienceType
-		)}client_id=${clientIdToUse}&client_secret=${clientSecretToUse}&grant_type=client_credentials`
+		)}client_id=${encodeURIComponent(
+			clientIdToUse
+		)}&client_secret=${encodeURIComponent(
+			clientSecretToUse
+		)}&grant_type=client_credentials`
 		/* Add a scope to the token request, if one is set */
 		const bodyWithScope = this.scope ? `${body}&scope=${this.scope}` : body