diff --git a/.github/workflows/build-agents.yml b/.github/workflows/build-agents.yml
index a3af104..86ec35f 100644
--- a/.github/workflows/build-agents.yml
+++ b/.github/workflows/build-agents.yml
@@ -6,7 +6,10 @@ on:
 
 jobs:
   testAgents:
-    uses: ./.github/workflows/run-tests.yml
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "foobar"
+    # uses: ./.github/workflows/run-tests.yml
 
   buildAgents:
     needs: testAgents
@@ -17,14 +20,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: 1.21
+
       - name: Build discovery agent
         working-directory: .
         run: |
           make build-discovery
+
       - name: Build traceability agent
         working-directory: .
         run: |
diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile
index 9bdc97b..3d6244b 100644
--- a/build/discovery.Dockerfile
+++ b/build/discovery.Dockerfile
@@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha=${commit_id}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${sdk_version}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=webMethodsDiscoveryAgent'" \
-  -a -o webmethods_discovery_agent ${BASEPATH}cmd/discovery/main.go
+  -a -o bin/webmethods_discovery_agent ${BASEPATH}cmd/discovery/main.go
 
 # Create non-root user
 RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER}
@@ -39,8 +39,8 @@ ENV APP_USER axway
 # Copy binary, user, config file and certs from previous build step
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder ${APP_HOME}/bin/webmethods_discovery_agent /webmethods_discovery_agent
-COPY /webmethods_discovery_agent.yml /webmethods_discovery_agent.yml
+COPY --from=builder bin/webmethods_discovery_agent /webmethods_discovery_agent
+COPY build/webmethods_discovery_agent.yml /webmethods_discovery_agent.yml
 
 RUN mkdir /keys && \
   chown -R axway /keys && \
diff --git a/build/traceability.Dockerfile b/build/traceability.Dockerfile
index 00dc8ad..2c45f9e 100644
--- a/build/traceability.Dockerfile
+++ b/build/traceability.Dockerfile
@@ -24,11 +24,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha=${commit_id}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${sdk_version}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=webMethodsTraceabilityAgent'" \
-  -a -o $webmethods_traceability_agent ${BASEPATH}/cmd/traceability/main.go
+  -a -o bin/webmethods_traceability_agent ${BASEPATH}/cmd/traceability/main.go
 
 # Create non-root user
 RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER}
-RUN chown -R ${APP_USER}:${APP_USER}  /webmethods_traceability_agent
+RUN chown -R ${APP_USER}:${APP_USER}  bin/webmethods_traceability_agent
 USER ${APP_USER}
 
 # alpine 3.18 linux/amd64 
@@ -39,8 +39,8 @@ ENV APP_USER axway
 # Copy binary, user, config file and certs from previous build step
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder /webmethods_traceability_agent /webmethods_traceability_agent
-COPY /webmethods_traceability_agent.yml /webmethods_traceability_agent.yml
+COPY --from=builder bin/webmethods_traceability_agent /webmethods_traceability_agent
+COPY build/webmethods_traceability_agent.yml /webmethods_traceability_agent.yml
 
 RUN mkdir /keys /data && \
   chown -R axway /keys /data && \