diff --git a/dockerfiles/bibliothek.yaml b/dockerfiles/bibliothek.yaml
index c0763df87..d8b5c55c9 100644
--- a/dockerfiles/bibliothek.yaml
+++ b/dockerfiles/bibliothek.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/bibliothek.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:6
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/blogapi.yaml b/dockerfiles/blogapi.yaml
index 95e5412c3..e2126fc85 100644
--- a/dockerfiles/blogapi.yaml
+++ b/dockerfiles/blogapi.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/blogapi.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -13,35 +14,20 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
-    
       db:
           condition: service_healthy
-    
-    
-
   db:
     image: mysql:8.0
     tmpfs:
       - '/var/lib/mysql'
-    
-
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: blogapi
-      
-
-
     volumes:
       - ../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql
       - ../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql
-      
-
-
     healthcheck:
       test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
-      retries: 3
-
-
-
+      retries: 3
\ No newline at end of file
diff --git a/dockerfiles/catwatch.yaml b/dockerfiles/catwatch.yaml
index 81d880fe8..f2b7464d7 100644
--- a/dockerfiles/catwatch.yaml
+++ b/dockerfiles/catwatch.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/catwatch.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/cwa-verification.yaml b/dockerfiles/cwa-verification.yaml
index 3e5fcb38d..2f44c05e8 100644
--- a/dockerfiles/cwa-verification.yaml
+++ b/dockerfiles/cwa-verification.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/cwa-verification.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/erc20-rest-service.yaml b/dockerfiles/erc20-rest-service.yaml
index 54c26642a..db78cd434 100644
--- a/dockerfiles/erc20-rest-service.yaml
+++ b/dockerfiles/erc20-rest-service.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/erc20-rest-service.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/familie-ba-sak.dockerfile b/dockerfiles/familie-ba-sak.dockerfile
index de86b38a9..60e320d85 100644
--- a/dockerfiles/familie-ba-sak.dockerfile
+++ b/dockerfiles/familie-ba-sak.dockerfile
@@ -14,4 +14,4 @@ ENTRYPOINT \
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/familie-ba-sak__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience -jar familie-ba-sak-sut.jar \
-    --server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:8083/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a
\ No newline at end of file
+    --server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a
\ No newline at end of file
diff --git a/dockerfiles/familie-ba-sak.yaml b/dockerfiles/familie-ba-sak.yaml
index c1d6548d6..0ca192359 100644
--- a/dockerfiles/familie-ba-sak.yaml
+++ b/dockerfiles/familie-ba-sak.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/familie-ba-sak.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,29 +13,21 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: postgres:13.13
     tmpfs:
       - '/var/lib/postgresql/data'
-    
-
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: familiebasak
-      
-
-
-
-
-
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:
-      LOG_LEVEL: VERBOSE
-      SERVER_PORT: 8083
+      LOG_LEVEL: verbose
+      SERVER_PORT: ${AUTH_PORT:-8081}
       JSON_CONFIG_PATH: /app/mockoauth2.json
     volumes:
       - ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
-  
+    ports:
+      - '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'
\ No newline at end of file
diff --git a/dockerfiles/features-service.yaml b/dockerfiles/features-service.yaml
index b682fac7a..937fe8db3 100644
--- a/dockerfiles/features-service.yaml
+++ b/dockerfiles/features-service.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/features-service.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/genome-nexus.yaml b/dockerfiles/genome-nexus.yaml
index b25a64d11..663175766 100644
--- a/dockerfiles/genome-nexus.yaml
+++ b/dockerfiles/genome-nexus.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/genome-nexus.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:3.6.2
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/gestaohospital.yaml b/dockerfiles/gestaohospital.yaml
index 255a3e7a8..08447fed4 100644
--- a/dockerfiles/gestaohospital.yaml
+++ b/dockerfiles/gestaohospital.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/gestaohospital.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:6
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/http-patch-spring.yaml b/dockerfiles/http-patch-spring.yaml
index b93577283..dcfbf3cc8 100644
--- a/dockerfiles/http-patch-spring.yaml
+++ b/dockerfiles/http-patch-spring.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/http-patch-spring.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/languagetool.yaml b/dockerfiles/languagetool.yaml
index 364f5e15e..d2e006b91 100644
--- a/dockerfiles/languagetool.yaml
+++ b/dockerfiles/languagetool.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/languagetool.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/market.yaml b/dockerfiles/market.yaml
index 0e7e11bfd..000285875 100644
--- a/dockerfiles/market.yaml
+++ b/dockerfiles/market.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/market.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/microcks.dockerfile b/dockerfiles/microcks.dockerfile
index 9572bc8bd..67e56a27c 100644
--- a/dockerfiles/microcks.dockerfile
+++ b/dockerfiles/microcks.dockerfile
@@ -13,5 +13,5 @@ ENTRYPOINT \
 #    unfortunately dumponexit is completely unreliable in Docker :(
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/microcks__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
-    -DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${HOST_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080} -jar microcks-sut.jar \
-    --server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${HOST_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:${HOST_PORT:-8080}/realms/microcks/protocol/openid-connect/certs
\ No newline at end of file
+    -DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${AUTH_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080} -jar microcks-sut.jar \
+    --server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${AUTH_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:8080/realms/microcks/protocol/openid-connect/certs
\ No newline at end of file
diff --git a/dockerfiles/microcks.yaml b/dockerfiles/microcks.yaml
index c2a9e7c15..2557f6823 100644
--- a/dockerfiles/microcks.yaml
+++ b/dockerfiles/microcks.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/microcks.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,69 +13,34 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   mongodb:
     image: mongo:7.0
     tmpfs:
       - '/data/db'
-    
-
     environment:
       MONGODB_REPLICA_SET_MODE: primary
       ALLOW_EMPTY_PASSWORD: yes
-      
-
-
-
-
-
-
-
   keycloak:
     image: quay.io/keycloak/keycloak:26.0.0
-    
-
     environment:
       KEYCLOAK_ADMIN: 'admin'
       KEYCLOAK_ADMIN_PASSWORD: 'admin'
       KC_HEALTH_ENABLED: 'true'
       KC_METRICS_ENABLED: 'true'
-      
-
-
     volumes:
       - ../scripts/dockerize/data/additional_files/microcks/microcks-realm-sample.json:/opt/keycloak/data/import/microcks-realm.json
-      
-
-
     healthcheck:
       test: ['CMD', 'sh', '-c', "echo -e 'GET /health/live HTTP/1.1\r\nHost: localhost\r\n\r\n' > /dev/tcp/localhost/9000"]
       interval: 30s
       timeout: 30s
       retries: 3
-
-
     ports:
-      - '${HOST_PORT:-8081}:8080'
-
-
-
-    command: ['start-dev', '--hostname=http://localhost:${HOST_PORT:-8081}', '--import-realm', '--health-enabled=true']
-
-
+      - '${AUTH_PORT:-8081}:8080'
+    command: ['start-dev', '--hostname=http://localhost:${AUTH_PORT:-8081}', '--import-realm', '--health-enabled=true']
   postman:
     image: quay.io/microcks/microcks-postman-runtime:0.6.0
-    
-
-
-
     healthcheck:
       test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
       interval: 30s
       timeout: 30s
-      retries: 3
-
-
-
-
-
+      retries: 3
\ No newline at end of file
diff --git a/dockerfiles/ocvn.yaml b/dockerfiles/ocvn.yaml
index 37d88643e..68f7cfbf1 100644
--- a/dockerfiles/ocvn.yaml
+++ b/dockerfiles/ocvn.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/ocvn.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:3.2
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/ohsome-api.yaml b/dockerfiles/ohsome-api.yaml
index c743a9637..3ec167241 100644
--- a/dockerfiles/ohsome-api.yaml
+++ b/dockerfiles/ohsome-api.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/ohsome-api.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/pay-publicapi.yaml b/dockerfiles/pay-publicapi.yaml
index 644bfe355..4e0614d1d 100644
--- a/dockerfiles/pay-publicapi.yaml
+++ b/dockerfiles/pay-publicapi.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/pay-publicapi.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,12 +13,5 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
-    image: redis:7.2.3
-    
-
-
-
-
-
+    image: redis:7.2.3
\ No newline at end of file
diff --git a/dockerfiles/person-controller.yaml b/dockerfiles/person-controller.yaml
index 70d336a91..9e4864f10 100644
--- a/dockerfiles/person-controller.yaml
+++ b/dockerfiles/person-controller.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/person-controller.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:7.0
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/proxyprint.yaml b/dockerfiles/proxyprint.yaml
index 951642a9a..ce0dee2ff 100644
--- a/dockerfiles/proxyprint.yaml
+++ b/dockerfiles/proxyprint.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/proxyprint.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/quartz-manager.yaml b/dockerfiles/quartz-manager.yaml
index ccd2fc5a1..bca5ca995 100644
--- a/dockerfiles/quartz-manager.yaml
+++ b/dockerfiles/quartz-manager.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/quartz-manager.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/reservations-api.yaml b/dockerfiles/reservations-api.yaml
index 0eb6404be..5deb912b4 100644
--- a/dockerfiles/reservations-api.yaml
+++ b/dockerfiles/reservations-api.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/reservations-api.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,24 +13,13 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: bitnami/mongodb:4.4
     tmpfs:
       - '/bitnami/mongodb'
-    
-
     environment:
       MONGODB_REPLICA_SET_MODE: primary
       ALLOW_EMPTY_PASSWORD: yes
-      
-
-
     volumes:
       - ../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
-      - ../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json
-      
-
-
-
-
+      - ../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json
\ No newline at end of file
diff --git a/dockerfiles/rest-ncs.yaml b/dockerfiles/rest-ncs.yaml
index 98139723c..d30bf5607 100644
--- a/dockerfiles/rest-ncs.yaml
+++ b/dockerfiles/rest-ncs.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/rest-ncs.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/rest-news.yaml b/dockerfiles/rest-news.yaml
index b1f3a4605..13a2f17f5 100644
--- a/dockerfiles/rest-news.yaml
+++ b/dockerfiles/rest-news.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/rest-news.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/rest-scs.yaml b/dockerfiles/rest-scs.yaml
index ce1965b2b..d9c7b1cbc 100644
--- a/dockerfiles/rest-scs.yaml
+++ b/dockerfiles/rest-scs.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/rest-scs.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/restcountries.yaml b/dockerfiles/restcountries.yaml
index 60f63d6e8..c670a17b4 100644
--- a/dockerfiles/restcountries.yaml
+++ b/dockerfiles/restcountries.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/restcountries.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/scout-api.yaml b/dockerfiles/scout-api.yaml
index 069d306f4..283075dba 100644
--- a/dockerfiles/scout-api.yaml
+++ b/dockerfiles/scout-api.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/scout-api.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/session-service.yaml b/dockerfiles/session-service.yaml
index 8842758fd..199178830 100644
--- a/dockerfiles/session-service.yaml
+++ b/dockerfiles/session-service.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/session-service.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,14 +13,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: mongo:6.0
     tmpfs:
-      - '/data/db'
-    
-
-
-
-
-
+      - '/data/db'
\ No newline at end of file
diff --git a/dockerfiles/spring-actuator-demo.yaml b/dockerfiles/spring-actuator-demo.yaml
index d6aef68df..9e53743b7 100644
--- a/dockerfiles/spring-actuator-demo.yaml
+++ b/dockerfiles/spring-actuator-demo.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/spring-actuator-demo.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/spring-batch-rest.yaml b/dockerfiles/spring-batch-rest.yaml
index 5c2f80f20..34576e3f4 100644
--- a/dockerfiles/spring-batch-rest.yaml
+++ b/dockerfiles/spring-batch-rest.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/spring-batch-rest.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/spring-ecommerce.yaml b/dockerfiles/spring-ecommerce.yaml
index 1a54b28db..c0ba2d305 100644
--- a/dockerfiles/spring-ecommerce.yaml
+++ b/dockerfiles/spring-ecommerce.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/spring-ecommerce.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,49 +13,24 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   mongodb:
     image: mongo:7.0
     tmpfs:
       - '/data/db'
-    
-
     environment:
       MONGODB_REPLICA_SET_MODE: primary
       ALLOW_EMPTY_PASSWORD: yes
-      
-
-
     volumes:
       - ../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
       - ../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json
-      
-
-
-
-
   redis:
     image: redis:7.0.11
-    
-
-
-
-
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.8.23
     tmpfs:
       - '/usr/share/elasticsearch/data'
-    
-
     environment:
       - discovery.type=single-node
       - cluster.name=elasticsearch
       - ES_JAVA_OPTS=-Xms512m -Xmx512m
-      - xpack.security.enabled=false
-      
-
-
-
-
-
+      - xpack.security.enabled=false
\ No newline at end of file
diff --git a/dockerfiles/spring-rest-example.yaml b/dockerfiles/spring-rest-example.yaml
index 35c6a8bc7..435d73f0e 100644
--- a/dockerfiles/spring-rest-example.yaml
+++ b/dockerfiles/spring-rest-example.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/spring-rest-example.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -13,30 +14,17 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
-    
       db:
           condition: service_healthy
-    
-    
-
   db:
     image: mysql:8.0
     tmpfs:
       - '/var/lib/mysql'
-    
-
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: example
-      
-
-
-
     healthcheck:
       test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
-      retries: 3
-
-
-
+      retries: 3
\ No newline at end of file
diff --git a/dockerfiles/swagger-petstore.yaml b/dockerfiles/swagger-petstore.yaml
index 5d7ea9ada..817fe34d5 100644
--- a/dockerfiles/swagger-petstore.yaml
+++ b/dockerfiles/swagger-petstore.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/swagger-petstore.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/tiltaksgjennomforing.dockerfile b/dockerfiles/tiltaksgjennomforing.dockerfile
index 24590ca9f..c279ad517 100644
--- a/dockerfiles/tiltaksgjennomforing.dockerfile
+++ b/dockerfiles/tiltaksgjennomforing.dockerfile
@@ -14,4 +14,4 @@ ENTRYPOINT \
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/tiltaksgjennomforing__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
      -jar tiltaksgjennomforing-sut.jar \
-    --server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing  --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO
\ No newline at end of file
+    --server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing  --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO
\ No newline at end of file
diff --git a/dockerfiles/tiltaksgjennomforing.yaml b/dockerfiles/tiltaksgjennomforing.yaml
index 5e763bad6..d6f658001 100644
--- a/dockerfiles/tiltaksgjennomforing.yaml
+++ b/dockerfiles/tiltaksgjennomforing.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/tiltaksgjennomforing.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -12,29 +13,21 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-
   db:
     image: postgres:13.13
     tmpfs:
       - '/var/lib/postgresql/data'
-    
-
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_DB: tiltaksgjennomforing
-      
-
-
-
-
-
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:
-      LOG_LEVEL: VERBOSE
-      SERVER_PORT: 8083
+      LOG_LEVEL: verbose
+      SERVER_PORT: ${AUTH_PORT:-8081}
       JSON_CONFIG_PATH: /app/mockoauth2.json
     volumes:
       - ../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json
-  
+    ports:
+      - '${AUTH_PORT:-8081}:${AUTH_PORT:-8081}'
\ No newline at end of file
diff --git a/dockerfiles/tracking-system.yaml b/dockerfiles/tracking-system.yaml
index 1ea6ba56a..ba572ae9b 100644
--- a/dockerfiles/tracking-system.yaml
+++ b/dockerfiles/tracking-system.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/tracking-system.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/user-management.yaml b/dockerfiles/user-management.yaml
index 24fc5e938..48f025736 100644
--- a/dockerfiles/user-management.yaml
+++ b/dockerfiles/user-management.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/user-management.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -13,30 +14,17 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
-    
       db:
           condition: service_healthy
-    
-    
-
   db:
     image: mysql:8.0
     tmpfs:
       - '/var/lib/mysql'
-    
-
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: users
-      
-
-
-
     healthcheck:
       test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
-      retries: 3
-
-
-
+      retries: 3
\ No newline at end of file
diff --git a/dockerfiles/webgoat.yaml b/dockerfiles/webgoat.yaml
index fbb036eb0..e480f235c 100644
--- a/dockerfiles/webgoat.yaml
+++ b/dockerfiles/webgoat.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/webgoat.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/dockerfiles/youtube-mock.yaml b/dockerfiles/youtube-mock.yaml
index 4f29cb325..65f5368f4 100644
--- a/dockerfiles/youtube-mock.yaml
+++ b/dockerfiles/youtube-mock.yaml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/youtube-mock.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -11,5 +12,4 @@ services:
       - "${JACOCO_PORT:-6300}:6300"
 #    volumes:
       # default env does not work on volumes
-#      - ${JACOCODIR}:/jacoco
-
+#      - ${JACOCODIR}:/jacoco
\ No newline at end of file
diff --git a/scripts/dockerize/data/sut.csv b/scripts/dockerize/data/sut.csv
index 40b4e1d75..9323a9565 100644
--- a/scripts/dockerize/data/sut.csv
+++ b/scripts/dockerize/data/sut.csv
@@ -1,37 +1,37 @@
 NAME,Dockerized,JVM_PARAMETERS,INPUT_PARAMETERS,SWAGGER_URL,TARGET_URL,COPY_ADDITIONAL_FILES,MOCK_OAUTH,DEPENDS_ON,SERVICES
-familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience,--server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:8083/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""port"": 5432.0, ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak"", ""volume"": """", ""health_check_command"": """"}]"
-pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""redis:7.2.3"", ""port"": 6379.0, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
-session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
-bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
-reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""bitnami/mongodb:4.4"", ""port"": 27017.0, ""tmp_fs"": ""/bitnami/mongodb"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json"", ""health_check_command"": """"}]"
+familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience,--server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak"", ""volume"": """", ""health_check_command"": """"},{""name"":""mock-oauth2-server"",""image_name"": ""ghcr.io/navikt/mock-oauth2-server:2.0.1"", ""tmp_fs"": """", ""environment"": ""LOG_LEVEL: verbose;SERVER_PORT: ${AUTH_PORT:-8081};JSON_CONFIG_PATH: /app/mockoauth2.json"", ""volume"": ""../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json"", ""port"": ""${AUTH_PORT:-8081}:${AUTH_PORT:-8081}"", ""health_check_command"": """"}]"
+pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""redis:7.2.3"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6.0"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""bitnami/mongodb:4.4"", ""tmp_fs"": ""/bitnami/mongodb"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json"", ""health_check_command"": """"}]"
 catwatch,TRUE,-Dserver.port=8080 -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,"",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 cwa-verification,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.datasource.username=sa -Dspring.datasource.password,"--server.port=8080 --spring.profiles.active=local,external,internal --management.server.port=-1 --server.ssl.enabled=false --cwa-testresult-server.url=http://cwa-testresult-server:8088",http://localhost:8080/api-docs.json,http://localhost:8080,FALSE,FALSE,"",
 features-service,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,--server.port=8080,http://localhost:8080/swagger.json,http://localhost:8080,FALSE,FALSE,"",
-gestaohospital,TRUE,"",--server.port=8080 --liquibase.enabled=false --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.datasource.username=sa --spring.datasource.password --dg-toolkit.derby.port=0 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+gestaohospital,TRUE,"",--server.port=8080 --liquibase.enabled=false --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.datasource.username=sa --spring.datasource.password --dg-toolkit.derby.port=0 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 languagetool,TRUE,"",--port 8080 --public,http://localhost:8080/v2/swagger,http://localhost:8080,FALSE,FALSE,"",
-ocvn,TRUE,-Dliquibase.enabled=false -Dspring.data.mongodb.uri=mongodb://db:27017/mongo_db -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.jpa.properties.hibernate.enable_lazy_load_no_trans=true -Dspring.datasource.username=sa -Dspring.datasource.password -Ddg-toolkit.derby.port=0 -Dspring.cache.type=NONE -Dspring.datasource.data=file:./init_db.sql,--server.port=8080,http://localhost:8080/v2/api-docs?group=1ocDashboardsApi,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""mongo:3.2"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+ocvn,TRUE,-Dliquibase.enabled=false -Dspring.data.mongodb.uri=mongodb://db:27017/mongo_db -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.jpa.properties.hibernate.enable_lazy_load_no_trans=true -Dspring.datasource.username=sa -Dspring.datasource.password -Ddg-toolkit.derby.port=0 -Dspring.cache.type=NONE -Dspring.datasource.data=file:./init_db.sql,--server.port=8080,http://localhost:8080/v2/api-docs?group=1ocDashboardsApi,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""mongo:3.2"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 proxyprint,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password -Dspring.jpa.show-sql=false -Dspring.jpa.hibernate.ddl-auto=create-drop -Xmx4G,--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 rest-ncs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 rest-news,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 rest-scs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 restcountries,TRUE,"",--server.port=8080,http://localhost:8080/openapi.yaml,http://localhost:8080,FALSE,FALSE,"",
 scout-api,TRUE,"",server scout_api_evomaster.yml,http://localhost:8080/api/swagger.json,http://localhost:8080,TRUE,FALSE,"",
-genome-nexus,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:3.6.2"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+genome-nexus,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:3.6.2"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 market,TRUE,"-Dspring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" -Dspring.datasource.username=sa -Dspring.datasource.password",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
-blogapi,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/blogapi?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true""",http://localhost:8080/blogapi.json,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: blogapi"", ""volume"": ""../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql;../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql"", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
-user-management,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/users?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: users"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
+blogapi,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/blogapi?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true""",http://localhost:8080/blogapi.json,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: blogapi"", ""volume"": ""../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql;../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql"", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
+user-management,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/users?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: users"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
 youtube-mock,TRUE,"",--server.port=8080,http://localhost:8080/swagger.yaml,http://localhost:8080,FALSE,FALSE,"",
-person-controller,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017 --spring.cache.type=None,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
+person-controller,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017 --spring.cache.type=None,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:7.0"", ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]"
 tracking-system,TRUE,"","--server.port=8080 --spring.profiles.active=dev --spring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/app/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
-tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing  --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""port"": 5432, ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing"", ""volume"": """", ""health_check_command"": """"}]"
+tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing  --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing"", ""volume"": """", ""health_check_command"": """"},{""name"":""mock-oauth2-server"",""image_name"": ""ghcr.io/navikt/mock-oauth2-server:2.0.1"", ""tmp_fs"": """", ""environment"": ""LOG_LEVEL: verbose;SERVER_PORT: ${AUTH_PORT:-8081};JSON_CONFIG_PATH: /app/mockoauth2.json"", ""volume"": ""../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json"", ""port"": ""${AUTH_PORT:-8081}:${AUTH_PORT:-8081}"", ""health_check_command"": """"}]"
 ohsome-api,TRUE,"",--server.port=8080 --database.db=heidelberg,http:///localhost:8080/docs?group=Data%20Aggregation,http://localhost:8080,TRUE,FALSE,"",
 spring-batch-rest,TRUE,"",--server.port=8080 --spring.batch.job.enabled=false --lastNamePrefix= --upperCase=false,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"",
-spring-rest-example,TRUE,"","--server.port=8080 --spring.datasource.username=root --spring.datasource.password=root --spring.datasource.url=""jdbc:mysql://db:3306/example?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: example"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
+spring-rest-example,TRUE,"","--server.port=8080 --spring.datasource.username=root --spring.datasource.password=root --spring.datasource.url=""jdbc:mysql://db:3306/example?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: example"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]"
 erc20-rest-service,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"",
 spring-actuator-demo,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"",
 webgoat,TRUE,-Drunning.in.docker=true,"--webgoat.port=8080 --webwolf.port=8081 --server.address=""0.0.0.0"" --spring.profiles.active=dev --spring.datasource.driver-class-name=org.h2.Driver --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none --spring.sql.init.mode=never --spring.datasource.url=""jdbc:h2:file:./test"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/WebGoat/v3/api-docs,http://localhost:8080,TRUE,FALSE,"",
 swagger-petstore,TRUE,"",8080,http://localhost:8080/api/v3/openapi.json,http://localhost:8080,TRUE,FALSE,"",
 http-patch-spring,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"",
-spring-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]"
+spring-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]"
 quartz-manager,TRUE,,--server.port=8080 --quartz-manager.security.accounts.in-memory.users[0].username=foo --quartz-manager.security.accounts.in-memory.users[0].password=bar --quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin --quartz-manager.security.accounts.in-memory.users[1].username=foo2 --quartz-manager.security.accounts.in-memory.users[1].password=bar --quartz-manager.security.accounts.in-memory.users[1].roles[0]=admin,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"",
-microcks,TRUE,-DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${HOST_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080},--server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${HOST_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:${HOST_PORT:-8080}/realms/microcks/protocol/openid-connect/certs,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": """", ""health_check_command"": """"},{""name"": ""keycloak"",""image_name"": ""quay.io/keycloak/keycloak:26.0.0"", ""command"":[""start-dev"", ""--hostname=http://localhost:${HOST_PORT:-8081}"", ""--import-realm"", ""--health-enabled=true""], ""port"": ""${HOST_PORT:-8081}:8080"", ""tmp_fs"": """", ""environment"": ""KEYCLOAK_ADMIN: 'admin';KEYCLOAK_ADMIN_PASSWORD: 'admin';KC_HEALTH_ENABLED: 'true';KC_METRICS_ENABLED: 'true'"", ""volume"": ""../scripts/dockerize/data/additional_files/microcks/microcks-realm-sample.json:/opt/keycloak/data/import/microcks-realm.json"", ""health_check_command"": [""CMD"", ""sh"", ""-c"", ""echo -e 'GET /health/live HTTP/1.1\r\nHost: localhost\r\n\r\n' > /dev/tcp/localhost/9000""]},{""name"": ""postman"", ""image_name"": ""quay.io/microcks/microcks-postman-runtime:0.6.0"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": [""CMD"", ""curl"", ""-f"", ""http://localhost:3000/health""]}]"
+microcks,TRUE,-DPOSTMAN_RUNNER_URL=http://postman:3000 -DSERVICES_UPDATE_INTERVAL='0 0 0/2 * * *' -DKEYCLOAK_URL=http://keycloak:8080 -DKEYCLOAK_PUBLIC_URL=http://localhost:${AUTH_PORT:-8081} -DENABLE_CORS_POLICY=false -DCORS_REST_ALLOW_CREDENTIALS=true -DTEST_CALLBACK_URL=http://localhost:${HOST_PORT:-8080},--server.port=8080 --spring.profiles.active=prod --grpc.server.port=0 --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:${AUTH_PORT:-8081}/realms/microcks --spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:8080/realms/microcks/protocol/openid-connect/certs,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": """", ""health_check_command"": """"},{""name"": ""keycloak"",""image_name"": ""quay.io/keycloak/keycloak:26.0.0"", ""command"":[""start-dev"", ""--hostname=http://localhost:${AUTH_PORT:-8081}"", ""--import-realm"", ""--health-enabled=true""], ""port"": ""${AUTH_PORT:-8081}:8080"", ""tmp_fs"": """", ""environment"": ""KEYCLOAK_ADMIN: 'admin';KEYCLOAK_ADMIN_PASSWORD: 'admin';KC_HEALTH_ENABLED: 'true';KC_METRICS_ENABLED: 'true'"", ""volume"": ""../scripts/dockerize/data/additional_files/microcks/microcks-realm-sample.json:/opt/keycloak/data/import/microcks-realm.json"", ""health_check_command"": [""CMD"", ""sh"", ""-c"", ""echo -e 'GET /health/live HTTP/1.1\r\nHost: localhost\r\n\r\n' > /dev/tcp/localhost/9000""]},{""name"": ""postman"", ""image_name"": ""quay.io/microcks/microcks-postman-runtime:0.6.0"", ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": [""CMD"", ""curl"", ""-f"", ""http://localhost:3000/health""]}]"
diff --git a/scripts/dockerize/docker_generator.py b/scripts/dockerize/docker_generator.py
index 967587d87..42cb13d36 100644
--- a/scripts/dockerize/docker_generator.py
+++ b/scripts/dockerize/docker_generator.py
@@ -152,8 +152,9 @@ def generate_docker_compose(self):
         result = template.render(params)
 
         with open(os.path.join(self.SCRIPT_LOCATION, f"{self.DOCKER_FILE_FOLDER}/{self.sut_name}.yaml"), "w") as f:
-            f.write(result)
-
+            non_empty_lines = [line for line in result.splitlines() if line.strip()]
+            cleaned_result = '\n'.join(non_empty_lines)
+            f.write(cleaned_result)
         print(f"Created {self.sut_name}.yaml")
 
     # def run_docker(self):
diff --git a/scripts/dockerize/templates/template.docker-compose.yml b/scripts/dockerize/templates/template.docker-compose.yml
index e651317a6..398f83267 100644
--- a/scripts/dockerize/templates/template.docker-compose.yml
+++ b/scripts/dockerize/templates/template.docker-compose.yml
@@ -3,7 +3,8 @@ services:
     build:
       dockerfile: ./dockerfiles/{{SUT_NAME}}.dockerfile
       context: ..
-#    environment:
+    environment:
+       AUTH_PORT: ${AUTH_PORT:-8081}
 #      TOOL: ${TOOL:-undefined}
 #      RUN: ${RUN:-0}
     ports:
@@ -22,14 +23,5 @@ services:
 {% for db_block in DATABASES %}
 {{ db_block }}
 {% endfor %}
-{%- if MOCK_OAUTH %}
-  mock-oauth2-server:
-    image: ghcr.io/navikt/mock-oauth2-server:2.0.1
-    environment:
-      LOG_LEVEL: VERBOSE
-      SERVER_PORT: 8083
-      JSON_CONFIG_PATH: /app/mockoauth2.json
-    volumes:
-      - ../scripts/dockerize/data/additional_files/{{SUT_NAME}}/mockoauth2.json:/app/mockoauth2.json
-  {% endif %}
+