diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba775a534d64291955648e24da611f3c5a3cd99..c92e8694f8f984638f7769e9cf29d719ff1b6adf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ linters:
     - golangci-lint run
 
 unit tests:
-  image: golang:1.21.3
+  image: golang:1.21.5
   stage: test
   script:
     - go version
@@ -23,7 +23,7 @@ unit tests:
   coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
 
 govulncheck:
-  image: golang:1.21.3
+  image: golang:1.21.5
   stage: test
   script:
     - go version
diff --git a/.golangci.yml b/.golangci.yml
index a31b66b24000f23ec82f765c828a26cf2bef07bd..bbcffe769d2a44cb772c1595ad69f69abf8fd2d6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -27,3 +27,4 @@ linters:
     - misspell
     - staticcheck
     - unused
+    - gosimple
diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index 80d6a86bdb9e99a0cfd04d493962e6b5bb2f71b4..d5924676e107a0719a14ab0c635c6d55392755c9 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.3-alpine3.17 as builder
+FROM golang:1.21.5-alpine3.17 as builder
 
 RUN apk add git
 
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index fbef3883765dbe544b05fe021cea8078ab68e700..ebc4977d29c51111f4499b03ded3977dc546fd62 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,15 +1,11 @@
-FROM golang:1.21.3
+FROM golang:1.21.5
 
-ENV GO111MODULE=on
-
-RUN go install github.com/canthefason/go-watcher/cmd/watcher@v0.2.4
+RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11
 
 ADD . /go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub
 
 WORKDIR /go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub
 
-RUN go install -mod=vendor ./cmd/infohub/...
-
 EXPOSE 8080
 
-ENTRYPOINT ["sh", "-c", "/go/bin/watcher -run gitlab.eclipse.org/eclipse/xfsc/tsa/infohub/cmd/infohub -watch gitlab.eclipse.org/eclipse/xfsc/tsa/infohub"]
+ENTRYPOINT ["sh", "-c", "/go/bin/guard -w '**/*.go' -- go run -mod=vendor ./cmd/infohub/..."]