diff --git a/.env b/.env
index e94562a1..a60ca0e4 100644
--- a/.env
+++ b/.env
@@ -125,7 +125,6 @@ KC_HOSTNAME=auth.meldestelle.local
 # 6. SERVICE DISCOVERY (Consul)
 # =============================================================================
 CONSUL_HOST=consul
-CONSUL_PORT=8500
 SERVICE_DISCOVERY_ENABLED=true
 SERVICE_DISCOVERY_REGISTER_SERVICES=true
 SERVICE_DISCOVERY_HEALTH_CHECK_PATH=/health
diff --git a/infrastructure/auth/auth-server/src/main/resources/application.yml b/infrastructure/auth/auth-server/src/main/resources/application.yml
index 9cab15c6..c9ef2fc9 100644
--- a/infrastructure/auth/auth-server/src/main/resources/application.yml
+++ b/infrastructure/auth/auth-server/src/main/resources/application.yml
@@ -6,8 +6,6 @@ spring:
     consul:
       discovery:
         enabled: false
-      config:
-        enabled: false
 
   security:
     oauth2:
@@ -29,8 +27,6 @@ management:
     health:
       show-details: always
       show-components: always
-  security:
-    enabled: false
 
 logging:
   level:
@@ -38,15 +34,5 @@ logging:
     org.springframework.security: DEBUG
     org.springframework.cloud.consul: INFO
 
-# Keycloak configuration
-keycloak:
-  auth-server-url: ${KEYCLOAK_AUTH_SERVER_URL:http://localhost:8180}
-  realm: meldestelle
-  resource: auth-server
-  credentials:
-    secret: your-client-secret-here
-
-# JWT configuration (development only - use proper secrets in production)
-jwt:
-  secret: dev-secret-key-change-in-production
-  expiration: 86400000 # 24 hours in milliseconds
+# Custom properties can be added here when proper @ConfigurationProperties classes are created
+# For now, these properties are moved to environment variables or removed to avoid warnings
diff --git a/infrastructure/gateway/src/main/resources/application.yml b/infrastructure/gateway/src/main/resources/application.yml
index 296838dd..c2301114 100644
--- a/infrastructure/gateway/src/main/resources/application.yml
+++ b/infrastructure/gateway/src/main/resources/application.yml
@@ -154,9 +154,6 @@ spring:
                 - Path=/api/ping/**
               filters:
                 - StripPrefix=1
-          filter:
-            weight:
-              enabled: false
 
 # Circuit Breaker Konfiguration
 resilience4j:
diff --git a/temp/ping-service/src/main/resources/application.yml b/temp/ping-service/src/main/resources/application.yml
index eea362e4..2c21439b 100644
--- a/temp/ping-service/src/main/resources/application.yml
+++ b/temp/ping-service/src/main/resources/application.yml
@@ -54,8 +54,5 @@ resilience4j:
         minimum-number-of-calls: 4
         wait-duration-in-open-state: 5s
 
-  # Optional: Metrics configuration
-  metrics:
-    enabled: true
-    legacy:
-      enabled: true
+  # Metrics configuration removed to avoid property resolution warnings
+  # Use micrometer and actuator endpoints for metrics instead
diff --git a/test_port_configuration.sh b/test_port_configuration.sh
index 1d3789c9..8e7f3297 100755
--- a/test_port_configuration.sh
+++ b/test_port_configuration.sh
@@ -49,8 +49,11 @@ fi
 echo
 echo "🧪 Test 2: All Services Have Unique Ports"
 echo "------------------------------------------"
-ALL_PORTS=($GATEWAY_TEST_PORT $PING_TEST_PORT ${CONSUL_PORT:-8500} ${REDIS_PORT:-6379})
-UNIQUE_PORTS=($(printf "%s\n" "${ALL_PORTS[@]}" | sort -u))
+ALL_PORTS=("$GATEWAY_TEST_PORT" "$PING_TEST_PORT" "${CONSUL_PORT:-8500}" "${REDIS_PORT:-6379}")
+UNIQUE_PORTS=()
+while IFS= read -r line; do
+    UNIQUE_PORTS+=("$line")
+done < <(printf "%s\n" "${ALL_PORTS[@]}" | sort -u)
 
 if [ ${#ALL_PORTS[@]} -eq ${#UNIQUE_PORTS[@]} ]; then
     echo "✅ PASS: All services have unique ports"