21 changed files with 180 additions and 321 deletions
--- a/.env.example
+++ b/.env.example
@ -2,4 +2,3 @@ CLOUDFLARE_ACCOUNT_ID="<cloudflare account id>"
 CLOUDFLARE_API_KEY="<cloudflare account key>"
 CLOUDFLARE_EMAIL="<cloudflare email>"
 ENV="<deployment env>"
-MGMT_PORT="5003"
--- a/.gitea/workflows/cftunnels_build_push.yml
+++ b/.gitea/workflows/cftunnels_build_push.yml
@ -1,138 +0,0 @@
-name: Build & Push CFTunnels
-run-name: CF Build started by ${{ gitea.actor }}
-
-on:
-  push:
-    branches:
-      - test      # → PATCH bump, build & tag as test
-      - main      # → MINOR bump, promote test→prod
-  workflow_dispatch:
-
-jobs:
-  version:
-    runs-on: ubuntu-latest
-    outputs:
-      new_version: ${{ steps.semver.outputs.new_version }}
-      target_env: ${{ steps.env.outputs.target_env }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Determine environment
-        id: env
-        run: |
-          [[ "${{ github.ref_name }}" == "main" ]] && ENV="prod" || ENV="${{ github.ref_name }}"
-          if [[ "$ENV" != "test" && "$ENV" != "prod" ]]; then
-            echo "→ Invalid environment: $ENV. Must be 'test' or 'prod'."
-            exit 1
-          fi
-          echo "target_env=$ENV" >> $GITHUB_OUTPUT
-
-      - name: Calculate semver bump
-        id: semver
-        run: |
-          VERSION=$(git describe --tags --match "cf-*" --abbrev=0 2>/dev/null || echo "cf-0.0.0")
-          echo "Latest tag: ${VERSION}"
-          # Strip cf- prefix
-          VERSION=${VERSION#cf-}
-          MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
-          MINOR=$(echo ${VERSION} | cut -d "." -f 2)
-          PATCH=$(echo ${VERSION} | cut -d "." -f 3)
-
-          if [[ "${{ steps.env.outputs.target_env }}" == "prod" ]]; then
-            # MINOR bump, reset PATCH
-            NEW_MINOR=$((MINOR + 1))
-            NEW_VERSION="${MAJOR}.${NEW_MINOR}.0"
-            echo "Production → minor bump: ${NEW_VERSION}"
-          else
-            # test → PATCH bump
-            NEW_PATCH=$((PATCH + 1))
-            NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
-            echo "Test → patch bump: ${NEW_VERSION}"
-          fi
-          echo "new_version=cf-${NEW_VERSION}" >> $GITHUB_OUTPUT
-
-  build-and-push:
-    runs-on: ubuntu-latest
-    needs: version
-    container:
-      image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install JDK (Alpine package)
-        run: |
-          apk add --no-cache openjdk17-jdk
-          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> "$GITHUB_ENV"
-
-      - name: Validate Gradle Wrapper (offline checksum)
-        run: |
-          sha256sum --check gradle/wrapper/gradle-wrapper.jar.sha256
-
-      - name: Create and push git tag
-        run: |
-          echo "New version: ${{ needs.version.outputs.new_version }}"
-          git config --global user.name "${{ gitea.actor }}"
-          git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
-          git tag -a "${{ needs.version.outputs.new_version }}" \
-            -m "Push CF version ${{ needs.version.outputs.new_version }}"
-          git push origin "${{ needs.version.outputs.new_version }}"
-
-      - name: Log in to Gitea Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: 'http://192.168.0.100:8928'
-          username: hitanshu
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build image (test) or promote (prod)
-        run: |
-          ENV="${{ needs.version.outputs.target_env }}"
-          VER="${{ needs.version.outputs.new_version }}"
-          REG="192.168.0.100:8928/hithomelabs/cftunnels"
-
-          if [[ "$ENV" == "test" ]]; then
-            echo "→ Building fresh image for test"
-            ./gradlew :cftunnels-service:bootBuildImage --imageName="${REG}:${VER}"
-            docker tag "${REG}:${VER}" "${REG}:test"
-            docker push "${REG}:test"
-            docker push "${REG}:${VER}"
-          else
-            echo "→ Promoting test image to prod"
-            docker pull "${REG}:test"
-            docker tag "${REG}:test" "${REG}:${VER}"
-            docker tag "${REG}:${VER}" "${REG}:prod"
-            docker push "${REG}:prod"
-            docker push "${REG}:${VER}"
-          fi
-
-      - name: Set Portainer deploy variables
-        id: portainer-vars
-        run: |
-          ENV="${{ needs.version.outputs.target_env }}"
-          if [[ "$ENV" == "prod" ]]; then
-            echo "url=http://192.168.0.100:8082" >> $GITHUB_OUTPUT
-            echo "stack=${{ vars.CFTUNNELS_PROD_STACK_ID }}" >> $GITHUB_OUTPUT
-            echo "key=${{ secrets.PORTAINER_SERVICE_API_KEY_PROD }}" >> $GITHUB_OUTPUT
-          else
-            echo "url=http://192.168.0.100:8081" >> $GITHUB_OUTPUT
-            echo "stack=${{ vars.CFTUNNELS_DEV_STACK_ID }}" >> $GITHUB_OUTPUT
-            echo "key=${{ secrets.PORTAINER_SERVICE_API_KEY }}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Trigger Portainer Redeploy
-        if: success()
-        env:
-          PORTAINER_AUTOMATION_URL: ${{ steps.portainer-vars.outputs.url }}
-          STACK_ID: ${{ steps.portainer-vars.outputs.stack }}
-          API_KEY: ${{ steps.portainer-vars.outputs.key }}
-        run: |
-          wget -q --no-check-certificate --timeout=30 \
-            --post-data= \
-            --header="X-API-Key: $API_KEY" \
-            -O - \
-            "$PORTAINER_AUTOMATION_URL/api/deploy/$STACK_ID" 2>&1 \
-            || echo "Deploy trigger failed (non-fatal)"
--- a/.gitea/workflows/portainer_automation_build_push.yml
+++ b/.gitea/workflows/portainer_automation_build_push.yml
@ -1,110 +1,66 @@
-name: Build & Push Portainer Automation
+name: portainer-automation build and push
 run-name: PA Build started by ${{ gitea.actor }}
-
 on:
  push:
-    branches:
-      - test      # → PATCH bump, build & tag as test
-      - main      # → MINOR bump, promote test→prod
-  workflow_dispatch:
-
+    branches: [test]
 jobs:
-  version:
+  tag:
    runs-on: ubuntu-latest
    outputs:
-      new_version: ${{ steps.semver.outputs.new_version }}
-      target_env: ${{ steps.env.outputs.target_env }}
+      new_version: ${{ steps.new_version.outputs.new_version }}
    steps:
-      - uses: actions/checkout@v4
+      - name: Check out repository code
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

-      - name: Determine environment
-        id: env
+      - name: Get new version
+        id: new_version
        run: |
-          [[ "${{ github.ref_name }}" == "main" ]] && ENV="prod" || ENV="${{ github.ref_name }}"
-          if [[ "$ENV" != "test" && "$ENV" != "prod" ]]; then
-            echo "→ Invalid environment: $ENV. Must be 'test' or 'prod'."
-            exit 1
-          fi
-          echo "target_env=$ENV" >> $GITHUB_OUTPUT
-
-      - name: Calculate semver bump
-        id: semver
-        run: |
-          VERSION=$(git describe --tags --match "pa-*" --abbrev=0 2>/dev/null || echo "pa-0.0.0")
-          echo "Latest tag: ${VERSION}"
-          # Strip pa- prefix
-          VERSION=${VERSION#pa-}
+          VERSION=$(git describe --tags --abbrev=0)
+          echo "Current version: ${VERSION}"
          MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
          MINOR=$(echo ${VERSION} | cut -d "." -f 2)
          PATCH=$(echo ${VERSION} | cut -d "." -f 3)
-
-          if [[ "${{ steps.env.outputs.target_env }}" == "prod" ]]; then
-            # MINOR bump, reset PATCH
-            NEW_MINOR=$((MINOR + 1))
-            NEW_VERSION="${MAJOR}.${NEW_MINOR}.0"
-            echo "Production → minor bump: ${NEW_VERSION}"
-          else
-            # test → PATCH bump
-            NEW_PATCH=$((PATCH + 1))
-            NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
-            echo "Test → patch bump: ${NEW_VERSION}"
-          fi
-          echo "new_version=pa-${NEW_VERSION}" >> $GITHUB_OUTPUT
-
-  build-and-push:
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
+          echo "New version: ${NEW_VERSION}"
+          echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT
+  build_tag_push:
    runs-on: ubuntu-latest
-    needs: version
+    needs: tag
    container:
      image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
    steps:
-      - uses: actions/checkout@v4
+      - name: Check out repository code
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
-
      - name: Install JDK (Alpine package)
        run: |
          apk add --no-cache openjdk17-jdk
          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> "$GITHUB_ENV"
-
      - name: Validate Gradle Wrapper (offline checksum)
        run: |
          sha256sum --check gradle/wrapper/gradle-wrapper.jar.sha256
-
-      - name: Create and push git tag
+      - name: Create and push tag
        run: |
-          echo "New version: ${{ needs.version.outputs.new_version }}"
+          echo "New version: ${{ needs.tag.outputs.new_version }}"
          git config --global user.name "${{ gitea.actor }}"
          git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
-          git tag -a "${{ needs.version.outputs.new_version }}" \
-            -m "Push PA version ${{ needs.version.outputs.new_version }}"
-          git push origin "${{ needs.version.outputs.new_version }}"
-
+          git tag -a "pa-${{ needs.tag.outputs.new_version }}" -m "Pushing PA version ${{ needs.tag.outputs.new_version }}"
+          git push origin "pa-${{ needs.tag.outputs.new_version }}"
      - name: Log in to Gitea Docker Registry
        uses: docker/login-action@v3
        with:
          registry: 'http://192.168.0.100:8928'
          username: hitanshu
          password: ${{ secrets.TOKEN }}
-
-      - name: Build image (test) or promote (prod)
+      - name: Gradle build image
+        run: ./gradlew :portainer-automation:bootBuildImage --imageName=192.168.0.100:8928/hithomelabs/portainer-automation:${{ needs.tag.outputs.new_version }}
+      - name: Tag image as test
+        run: docker tag 192.168.0.100:8928/hithomelabs/portainer-automation:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/portainer-automation:test
+      - name: Push to Gitea Registry
        run: |
-          ENV="${{ needs.version.outputs.target_env }}"
-          VER="${{ needs.version.outputs.new_version }}"
-          REG="192.168.0.100:8928/hithomelabs/portainer-automation"
-
-          if [[ "$ENV" == "test" ]]; then
-            echo "→ Building fresh image for test"
-            ./gradlew :portainer-automation:bootBuildImage --imageName="${REG}:${VER}"
-            docker tag "${REG}:${VER}" "${REG}:test"
-            docker push "${REG}:test"
-            docker push "${REG}:${VER}"
-          else
-            echo "→ Promoting test image to prod"
-            docker pull "${REG}:test"
-            docker tag "${REG}:test" "${REG}:${VER}"
-            docker tag "${REG}:${VER}" "${REG}:prod"
-            docker push "${REG}:prod"
-            docker push "${REG}:${VER}"
-          fi
+          docker push 192.168.0.100:8928/hithomelabs/portainer-automation:test
+          docker push 192.168.0.100:8928/hithomelabs/portainer-automation:${{ needs.tag.outputs.new_version }}
--- a/.gitea/workflows/prod_image_tag_promote.yaml
+++ b/.gitea/workflows/prod_image_tag_promote.yaml
@ -0,0 +1,57 @@
+name: Promote image with tag test to prod
+run-name: Build started by $ {{gitea.actor}}
+on:
+  push:
+    branches: [main]
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.new_version.outputs.new_version }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get new version
+        id: new_version
+        run: |
+          VERSION=$(git describe --tags --abbrev=0)
+          echo ${VERSION}
+          MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
+          MINOR=$(echo ${VERSION} | cut -d "." -f 2)
+          PATCH=0
+          NEW_MINOR=$(( ${MINOR} + 1))
+          echo ${NEW_MINOR}
+          echo "new_version=$(echo "${MAJOR}.${NEW_MINOR}.${PATCH}")" >> $GITHUB_OUTPUT
+  build_tag_push:
+    runs-on: ubuntu-latest
+    needs: tag
+    container:
+      image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Create and push tag
+        run: |
+          echo "NEW_VERSION=${{ needs.tag.outputs.new_version }}"
+          git config --global user.name "${{gitea.actor}}"
+          git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
+          git tag -a ${{ needs.tag.outputs.new_version }} -m "Pushing new version ${{ needs.tag.outputs.new_version }}"
+          git push origin ${{ needs.tag.outputs.new_version }}
+      - name: Log in to Gitea Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: 'http://192.168.0.100:8928'
+          username: hitanshu
+          password: ${{ secrets.TOKEN }}
+      - name: Tag prod image
+        run: |
+          docker tag 192.168.0.100:8928/hithomelabs/cftunnels:test 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
+          docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/cftunnels:prod
+      - name: Push to Gitea Registry
+        run: |
+          docker push 192.168.0.100:8928/hithomelabs/cftunnels:prod
+          docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
--- a/.gitea/workflows/test_image_build_push.yml
+++ b/.gitea/workflows/test_image_build_push.yml
@ -0,0 +1,66 @@
+name: sample gradle build and test
+run-name: Build started by ${{ gitea.actor }}
+on:
+  push:
+    branches: [test]
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.new_version.outputs.new_version }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get new version
+        id: new_version
+        run: |
+          VERSION=$(git describe --tags --abbrev=0)
+          echo "Current version: ${VERSION}"
+          MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
+          MINOR=$(echo ${VERSION} | cut -d "." -f 2)
+          PATCH=$(echo ${VERSION} | cut -d "." -f 3)
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
+          echo "New version: ${NEW_VERSION}"
+          echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT
+  build_tag_push:
+    runs-on: ubuntu-latest
+    needs: tag
+    container:
+      image: 192.168.0.100:8928/hithomelabs/ci-runner:1.0.0
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install JDK (Alpine package)
+        run: |
+          apk add --no-cache openjdk17-jdk
+          echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk" >> "$GITHUB_ENV"
+      - name: Validate Gradle Wrapper (offline checksum)
+        run: |
+          sha256sum --check gradle/wrapper/gradle-wrapper.jar.sha256
+      - name: Create and push tag
+        run: |
+          echo "New version: ${{ needs.tag.outputs.new_version }}"
+          git config --global user.name "${{ gitea.actor }}"
+          git config --global user.email "${{ gitea.actor }}@users.noreply.github.com"
+          git tag -a "${{ needs.tag.outputs.new_version }}" -m "Pushing new version ${{ needs.tag.outputs.new_version }}"
+          git push origin "${{ needs.tag.outputs.new_version }}"
+      - name: Log in to Gitea Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: 'http://192.168.0.100:8928'
+          username: hitanshu
+          password: ${{ secrets.TOKEN }}
+      - name: Gradle build
+        run: ./gradlew :cftunnels-service:bootBuildImage --imageName=192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
+      - name: Tag image as test
+        run: docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/cftunnels:test
+      - name: Push to Gitea Registry
+        run: |
+          docker push 192.168.0.100:8928/hithomelabs/cftunnels:test
+          docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
--- a/cftunnels-service/Dockerfile
+++ b/cftunnels-service/Dockerfile
@ -9,5 +9,4 @@ RUN ./gradlew :cftunnels-service:bootJar

 FROM openjdk:17-jdk-slim
 COPY --from=build /app/cftunnels-service/build/libs/*.jar app.jar
-EXPOSE 8080 8081
 ENTRYPOINT ["java", "-jar", "/app.jar"]
--- a/cftunnels-service/build.gradle
+++ b/cftunnels-service/build.gradle
@ -7,7 +7,6 @@ dependencies {
    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
    implementation 'org.hibernate.validator:hibernate-validator'

--- a/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Config/Security/ActuatorSecurityConfig.java
+++ b/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Config/Security/ActuatorSecurityConfig.java
@ -1,39 +0,0 @@
-package com.hithomelabs.cftunnels.Config.Security;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
-
-/**
- * Security configuration for Spring Boot Actuator endpoints.
- *
- * This configuration permits unauthenticated access to /actuator/health and /actuator/info
- * endpoints, enabling health monitoring by Uptime Kuma without requiring OIDC authentication.
- * All other actuator endpoints remain protected and require authentication.
- *
- * Uses @Order(Ordered.HIGHEST_PRECEDENCE) to ensure this filter chain is evaluated BEFORE
- * any auto-configured management security filter chains (e.g., ManagementWebSecurityAutoConfiguration).
- * Without this, the catch-all SecurityFilterChain in SecuirtyConfig can intercept actuator
- * requests on the separate management port (management.server.port=8081) and redirect to OIDC login.
- */
-@Configuration
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class ActuatorSecurityConfig {
-
-    @Bean
-    public SecurityFilterChain actuatorSecurityChain(HttpSecurity http) throws Exception {
-        http
-                .securityMatcher(EndpointRequest.toAnyEndpoint())
-                .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/actuator/health", "/actuator/info").permitAll()
-                        .anyRequest().authenticated()
-                )
-                .csrf(csrf -> csrf.disable());
-
-        return http.build();
-    }
-}
--- a/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Config/Security/SecuirtyConfig.java
+++ b/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Config/Security/SecuirtyConfig.java
@ -29,7 +29,6 @@ public class SecuirtyConfig {
        http
                .authorizeHttpRequests(auth -> auth
                        //.requestMatchers( "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html" ).permitAll()
-                        .requestMatchers("/actuator/health", "/actuator/info").permitAll()
                        .anyRequest().authenticated()
                ).csrf(csrf -> csrf.disable())
                .with(new OAuth2LoginConfigurer<>(),
--- a/cftunnels-service/src/main/resources/application-ci.properties
+++ b/cftunnels-service/src/main/resources/application-ci.properties
@ -5,7 +5,3 @@ spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
 spring.jpa.hibernate.ddl-auto=none
-
-# Actuator configuration for CI
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=never
--- a/cftunnels-service/src/main/resources/application-local.properties
+++ b/cftunnels-service/src/main/resources/application-local.properties
@ -1,10 +1,8 @@
 api.baseUrl=http://localhost:8080

-# Actuator configuration for local development
-management.server.port=8081
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=always
 management.health.db.enabled=true
+management.endpoints.web.exposure.include=health
+management.endpoint.health.show-details=always

 logging.level.org.hibernate.SQL=DEBUG
 debug=true
--- a/cftunnels-service/src/main/resources/application-prod.properties
+++ b/cftunnels-service/src/main/resources/application-prod.properties
@ -10,7 +10,3 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-# Actuator configuration
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=when-authorized
--- a/cftunnels-service/src/main/resources/application-test.properties
+++ b/cftunnels-service/src/main/resources/application-test.properties
@ -10,7 +10,3 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-# Actuator configuration
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=when-authorized
--- a/cftunnels-service/src/main/resources/application.properties
+++ b/cftunnels-service/src/main/resources/application.properties
@ -36,8 +36,3 @@ spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

 spring.jpa.open-in-view=false
-
-# Actuator configuration - management port and exposed endpoints
-management.server.port=8081
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=when-authorized
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -4,7 +4,6 @@ services:
    container_name: cftunnels_${ENV}
    ports:
      - ${HOST_PORT}:8080
-      - ${MGMT_PORT:-5003}:8081
    environment:
      - CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
      - CLOUDFLARE_API_KEY=${CLOUDFLARE_API_KEY}
@ -31,3 +30,15 @@ services:
      - "${DB_PORT}:5432"
    volumes:
      - ${DB_PATH}:/var/lib/postgresql/data
+  portainer-automation:
+    image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV}
+    container_name: portainer-automation_${ENV}
+    ports:
+      - "${PORTAINER_AUTOMATION_PORT:-8081}:8081"
+    environment:
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
+      - PORTAINER_API_KEY=${PORTAINER_API_KEY}
+      - PORTAINER_SERVICE_API_KEY=${PORTAINER_SERVICE_API_KEY}
+    env_file:
+      - stack.env
+    restart: unless-stopped
--- a/portainer-automation/.env.example
+++ b/portainer-automation/.env.example
@ -36,6 +36,3 @@ ENV=dev

 # Host port to map to container port 8081
 HOST_PORT=8081
-
-# Host port to map to actuator management port 8082 (health checks, LAN only)
-MGMT_PORT=5005
--- a/portainer-automation/Dockerfile
+++ b/portainer-automation/Dockerfile
@ -9,5 +9,4 @@ RUN ./gradlew :portainer-automation:bootJar

 FROM openjdk:17-jdk-slim
 COPY --from=build /app/portainer-automation/build/libs/*.jar app.jar
-EXPOSE 8081 8082
 ENTRYPOINT ["java", "-jar", "/app.jar"]
--- a/portainer-automation/build.gradle
+++ b/portainer-automation/build.gradle
@ -5,7 +5,6 @@ dependencies {

    implementation 'org.springframework.boot:spring-boot-starter-web'
    implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
    implementation 'org.apache.httpcomponents.client5:httpclient5'

    compileOnly 'org.projectlombok:lombok'
--- a/portainer-automation/docker-compose.yaml
+++ b/portainer-automation/docker-compose.yaml
@ -3,8 +3,7 @@ services:
    image: gitea.hithomelabs.com/hithomelabs/portainer-automation:${ENV:-test}
    container_name: portainer-automation_${ENV:-test}
    ports:
-      - "${HOST_PORT:-8081}:8081"   # Application port (internal service)
-      - "${MGMT_PORT:-5005}:8082"   # Health management port (LAN only)
+      - "${HOST_PORT:-8081}:8081"
    environment:
      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-local}
      - PORTAINER_API_KEY=${PORTAINER_API_KEY}
--- a/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java
+++ b/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java
@ -22,11 +22,12 @@ import java.security.cert.X509Certificate;
 public class PortainerClientConfig {

    /**
-     * Builds a RestTemplate that trusts all SSL certificates.
-     * Used when connecting via Cloudflare Tunnel (self-signed certs)
-     * or to the prod Portainer instance (also self-signed).
+     * Trust-all SSL RestTemplate for the "local" profile.
+     * Used when connecting via Cloudflare Tunnel (self-signed certs).
     */
-    private static RestTemplate buildTrustAllRestTemplate() throws Exception {
+    @Profile("local")
+    @Bean(name = "portainerRestTemplate")
+    public RestTemplate portainerRestTemplateLocal() throws Exception {
        TrustManager[] trustAllCerts = new TrustManager[]{
                new X509TrustManager() {
                    public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
@ -46,32 +47,12 @@ public class PortainerClientConfig {
    }

    /**
-     * Trust-all SSL RestTemplate for the "local" profile.
-     * Used when connecting via Cloudflare Tunnel (self-signed certs).
+     * Standard validating SSL RestTemplate for non-local profiles
+     * (CI, test, prod — internal Docker network).
     */
-    @Profile("local")
+    @Profile("!local")
    @Bean(name = "portainerRestTemplate")
-    public RestTemplate portainerRestTemplateLocal() throws Exception {
-        return buildTrustAllRestTemplate();
-    }
-
-    /**
-     * Trust-all SSL RestTemplate for the "prod" profile.
-     * Prod Portainer at https://192.168.0.100:9443 uses a self-signed certificate.
-     */
-    @Profile("prod")
-    @Bean(name = "portainerRestTemplate")
-    public RestTemplate portainerRestTemplateProd() throws Exception {
-        return buildTrustAllRestTemplate();
-    }
-
-    /**
-     * Standard validating SSL RestTemplate for profiles other than local and prod
-     * (CI, test — internal Docker network with valid certs).
-     */
-    @Profile("!local & !prod")
-    @Bean(name = "portainerRestTemplate")
-    public RestTemplate portainerRestTemplateDefault() {
+    public RestTemplate portainerRestTemplate() {
        return new RestTemplate();
    }

--- a/portainer-automation/src/main/resources/application.properties
+++ b/portainer-automation/src/main/resources/application.properties
@ -3,9 +3,3 @@ portainer.base-url=https://192.168.0.100:9442
 portainer.api-key=${PORTAINER_API_KEY:}
 portainer.endpoint-id=1
 portainer.service.api-key=${PORTAINER_SERVICE_API_KEY:change-me}
-
-# Actuator configuration - management port and exposed endpoints
-# App runs on server.port=8081, so management port must differ (8082)
-management.server.port=8082
-management.endpoints.web.exposure.include=health,info
-management.endpoint.health.show-details=when-authorized