diff --git a/DSL/Resql/users/POST/get-configuration.sql b/DSL/Resql/services/POST/get-configuration.sql
similarity index 100%
rename from DSL/Resql/users/POST/get-configuration.sql
rename to DSL/Resql/services/POST/get-configuration.sql
diff --git a/DSL/Resql/training/POST/get-new-nonce.sql b/DSL/Resql/services/POST/get-new-nonce.sql
similarity index 100%
rename from DSL/Resql/training/POST/get-new-nonce.sql
rename to DSL/Resql/services/POST/get-new-nonce.sql
diff --git a/DSL/Resql/users/POST/get-user-by-login.sql b/DSL/Resql/services/POST/get-user-by-login.sql
similarity index 100%
rename from DSL/Resql/users/POST/get-user-by-login.sql
rename to DSL/Resql/services/POST/get-user-by-login.sql
diff --git a/DSL/Resql/users/POST/get-user-domains.sql b/DSL/Resql/services/POST/get-user-domains.sql
similarity index 100%
rename from DSL/Resql/users/POST/get-user-domains.sql
rename to DSL/Resql/services/POST/get-user-domains.sql
diff --git a/DSL/Resql/users/POST/get-widget-domains.sql b/DSL/Resql/services/POST/get-widget-domains.sql
similarity index 100%
rename from DSL/Resql/users/POST/get-widget-domains.sql
rename to DSL/Resql/services/POST/get-widget-domains.sql
diff --git a/DSL/Resql/users/POST/is-user-roles-allowed.sql b/DSL/Resql/services/POST/is-user-roles-allowed.sql
similarity index 100%
rename from DSL/Resql/users/POST/is-user-roles-allowed.sql
rename to DSL/Resql/services/POST/is-user-roles-allowed.sql
diff --git a/DSL/Resql/training/POST/use-nonce.sql b/DSL/Resql/services/POST/use-nonce.sql
similarity index 100%
rename from DSL/Resql/training/POST/use-nonce.sql
rename to DSL/Resql/services/POST/use-nonce.sql
diff --git a/DSL/Resql/training/GET/empty.sql b/DSL/Resql/training/GET/empty.sql
deleted file mode 100644
index 531c7647c..000000000
--- a/DSL/Resql/training/GET/empty.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- This is a empty sql for Buerokratt DSL delivery method
-SELECT current_date;
diff --git a/DSL/Resql/users/GET/empty.sql b/DSL/Resql/users/GET/empty.sql
deleted file mode 100644
index 531c7647c..000000000
--- a/DSL/Resql/users/GET/empty.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- This is a empty sql for Buerokratt DSL delivery method
-SELECT current_date;
diff --git a/DSL/Ruuter/services/GET/accounts/widget-data.yml b/DSL/Ruuter/services/GET/accounts/widget-data.yml
index 51dd93a72..d8e13544b 100644
--- a/DSL/Ruuter/services/GET/accounts/widget-data.yml
+++ b/DSL/Ruuter/services/GET/accounts/widget-data.yml
@@ -22,13 +22,13 @@ extractRequestData:
 getDomains:
   call: http.post
   args:
-    url: "[#SERVICE_USERS_RESQL]/get-widget-domains"
+    url: "[#SERVICE_RESQL]/get-widget-domains"
   result: domains
 
 getUserDomains:
   call: http.post
   args:
-    url: "[#SERVICE_USERS_RESQL]/get-user-domains"
+    url: "[#SERVICE_RESQL]/get-user-domains"
     body:
       user_login: ${user_id}
   result: user_domains
diff --git a/DSL/Ruuter/services/GET/get-new-nonce.yml b/DSL/Ruuter/services/GET/get-new-nonce.yml
index b37fb6a2f..35c052fc2 100644
--- a/DSL/Ruuter/services/GET/get-new-nonce.yml
+++ b/DSL/Ruuter/services/GET/get-new-nonce.yml
@@ -10,7 +10,7 @@ declaration:
 get_new_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
+    url: "[#SERVICE_RESQL]/get-new-nonce"
   result: nonce_res
 
 return_result:
diff --git a/DSL/Ruuter/services/GET/services/active/.guard b/DSL/Ruuter/services/GET/services/active/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/GET/services/active/.guard
+++ b/DSL/Ruuter/services/GET/services/active/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/GET/services/draft/.guard b/DSL/Ruuter/services/GET/services/draft/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/GET/services/draft/.guard
+++ b/DSL/Ruuter/services/GET/services/draft/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/GET/services/inactive/.guard b/DSL/Ruuter/services/GET/services/inactive/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/GET/services/inactive/.guard
+++ b/DSL/Ruuter/services/GET/services/inactive/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/POST/auth/login.yml b/DSL/Ruuter/services/POST/auth/login.yml
index 307719350..82d4d5417 100644
--- a/DSL/Ruuter/services/POST/auth/login.yml
+++ b/DSL/Ruuter/services/POST/auth/login.yml
@@ -30,7 +30,7 @@ extract_request_data:
 login_user:
   call: http.post
   args:
-    url: "[#SERVICE_USERS_RESQL]/get-user-by-login"
+    url: "[#SERVICE_RESQL]/get-user-by-login"
     body:
       login: ${login}
       password: ${password}
@@ -46,7 +46,7 @@ check_login_result:
 get_session_length:
   call: http.post
   args:
-    url: "[#SERVICE_USERS_RESQL]/get-configuration"
+    url: "[#SERVICE_RESQL]/get-configuration"
     body:
       key: "session_length"
   result: session_result
diff --git a/DSL/Ruuter/services/POST/services/active/.guard b/DSL/Ruuter/services/POST/services/active/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/POST/services/active/.guard
+++ b/DSL/Ruuter/services/POST/services/active/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/POST/services/draft/.guard b/DSL/Ruuter/services/POST/services/draft/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/POST/services/draft/.guard
+++ b/DSL/Ruuter/services/POST/services/draft/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/POST/services/inactive/.guard b/DSL/Ruuter/services/POST/services/inactive/.guard
index 9e768b6bc..fe90635c8 100644
--- a/DSL/Ruuter/services/POST/services/inactive/.guard
+++ b/DSL/Ruuter/services/POST/services/inactive/.guard
@@ -11,7 +11,7 @@ process_request:
 verify_header_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.headers['x-ruuter-nonce']}
   result: nonce_response
@@ -20,7 +20,7 @@ verify_header_nonce:
 verify_param_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
+    url: "[#SERVICE_RESQL]/use-nonce"
     body:
       updated_nonce: ${incoming.params['ruuter-nonce']}
   result: nonce_response
diff --git a/DSL/Ruuter/services/TEMPLATES/jump-to-service.yml b/DSL/Ruuter/services/TEMPLATES/jump-to-service.yml
index 46e268c8e..c286e8449 100644
--- a/DSL/Ruuter/services/TEMPLATES/jump-to-service.yml
+++ b/DSL/Ruuter/services/TEMPLATES/jump-to-service.yml
@@ -44,7 +44,7 @@ assign_service_status:
 get_new_nonce:
   call: http.post
   args:
-    url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
+    url: "[#SERVICE_RESQL]/get-new-nonce"
   result: nonce_res
   next: trigger_service
 
diff --git a/GUI/src/services/service-builder.test.ts b/GUI/src/services/service-builder.test.ts
index 91378380c..cdf394e84 100644
--- a/GUI/src/services/service-builder.test.ts
+++ b/GUI/src/services/service-builder.test.ts
@@ -327,7 +327,7 @@ describe('Nonce step injection', () => {
 
     expect(result.backup_conversations_get_new_nonce).toEqual({
       call: 'http.post',
-      args: { url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce' },
+      args: { url: '[#SERVICE_RESQL]/get-new-nonce' },
       result: 'backup_conversations_nonce',
       next: 'backup_conversations',
     });
@@ -365,7 +365,7 @@ describe('Nonce step injection', () => {
     expect(result.backup_conversations.next).toBe('empty_messages_get_new_nonce');
     expect(result.empty_messages_get_new_nonce).toEqual({
       call: 'http.post',
-      args: { url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce' },
+      args: { url: '[#SERVICE_RESQL]/get-new-nonce' },
       result: 'empty_messages_nonce',
       next: 'empty_messages',
     });
diff --git a/GUI/src/services/service-builder.ts b/GUI/src/services/service-builder.ts
index 259489af6..062ff81f2 100644
--- a/GUI/src/services/service-builder.ts
+++ b/GUI/src/services/service-builder.ts
@@ -1016,7 +1016,7 @@ function injectNonceStep(finishedFlow: Map<any, any>, stepName: string) {
   insertStepBefore(finishedFlow, stepName, nonceStepName, {
     call: 'http.post',
     args: {
-      url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce',
+      url: '[#SERVICE_RESQL]/get-new-nonce',
     },
     result: nonceResultName,
     next: stepName,
diff --git a/constants.ini b/constants.ini
index 1269b08dd..73a2c3917 100644
--- a/constants.ini
+++ b/constants.ini
@@ -2,10 +2,6 @@
 
 SERVICE_RESQL=http://resql:8087/services
 
-SERVICE_USERS_RESQL=http://resql-users:8088/users
-
-SERVICE_TRAINING_RESQL=http://resql-training:8083/training
-
 SERVICE_DOCKER_INT=http://host.docker.internal:8080
 
 SERVICE_OPENSEARCH=http://opensearch:9200
@@ -26,10 +22,6 @@ STORAGE_FERRY_ACCOUNT_ID=azure-testaccount1
 
 STORAGE_FERRY_CONTAINER=buerokratt
 
-TRAINING_RUUTER=http://byk-private-ruuter:8080/training
-
-TRAINING_NODE=http://node:3000
-
 SERVICE_SIGA=https://siga-demo.localhost:9443
 
 RUUTER_SERVICES_GET_PATH=/Ruuter/services/GET/services
diff --git a/docker-compose.yml b/docker-compose.yml
index 8796e458f..759fbd36e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,10 +47,9 @@ services:
       - database
     environment:
       - sqlms.datasources.[0].name=byk
-      # - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://database:5432/services_db # For Local Use
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5435/services_db
+      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.156:5434/byk
       - sqlms.datasources.[0].username=byk
-      - sqlms.datasources.[0].password=01234
+      - sqlms.datasources.[0].password=byk
       - logging.level.org.springframework.boot=INFO
       - server.port=8087
     ports:
@@ -60,43 +59,6 @@ services:
     networks:
       - bykstack
 
-  resql_users:
-    container_name: resql-users
-    image: resql
-    depends_on:
-      - database
-    environment:
-      - server.port=8088
-      - sqlms.datasources.[0].name=byk
-      # - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://database:5432/users_db # For Local Use
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5433/byk
-      - sqlms.datasources.[0].username=byk
-      - sqlms.datasources.[0].password=2nH09n6Gly
-      - logging.level.org.springframework.boot=INFO
-    ports:
-      - 8088:8088
-    volumes:
-      - ./DSL/Resql:/DSL
-    networks:
-      - bykstack
-
-  resql_training:
-    container_name: resql-training
-    image: resql
-    environment:
-      - sqlms.datasources.[0].name=byk
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5434/train_db
-      - sqlms.datasources.[0].username=byk
-      - sqlms.datasources.[0].password=01234
-      - logging.level.org.springframework.boot=INFO
-      - server.port=8083
-    ports:
-      - 8083:8083
-    volumes:
-      - ./DSL/Resql:/DSL
-    networks:
-      - bykstack    
-
   data-mapper:
     container_name: data-mapper
     image: data-mapper