diff --git a/.github/workflows/docker-compose-test.yml b/.github/workflows/docker-compose-test.yml
index 8073671..483ef6f 100644
--- a/.github/workflows/docker-compose-test.yml
+++ b/.github/workflows/docker-compose-test.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: 1.21
     - name: Docker Compose setup 
       if: ${{ !startsWith(github.event.head_commit.message, 'Release') }}
       run: |
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
index 1722f91..38a2899 100644
--- a/.github/workflows/go-test.yml
+++ b/.github/workflows/go-test.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: 1.21
     - name: Linux Setup
       if: ${{ !startsWith(github.event.head_commit.message, 'Release') && matrix.os == 'ubuntu-latest'}}
       run: |
diff --git a/.github/workflows/server-releaser.yml b/.github/workflows/server-releaser.yml
index 2f71cd9..d0e52af 100644
--- a/.github/workflows/server-releaser.yml
+++ b/.github/workflows/server-releaser.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
       - name: Build server binary
         run: |
           GOARCH=${{ matrix.goarch }} GOOS=${{ matrix.goos }} go build -o hishtory-server-${{ matrix.goos }}-${{ matrix.goarch }} backend/server/server.go
diff --git a/.github/workflows/slsa-releaser.yml b/.github/workflows/slsa-releaser.yml
index 6dbf2f8..eac6d47 100644
--- a/.github/workflows/slsa-releaser.yml
+++ b/.github/workflows/slsa-releaser.yml
@@ -32,7 +32,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-linux-amd64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-linux-arm64:
@@ -44,7 +44,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-linux-arm64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-linux-arm7:
@@ -56,7 +56,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-linux-arm7.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-freebsd-amd64:
@@ -68,7 +68,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-freebsd-amd64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-netbsd-amd64:
@@ -80,7 +80,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-netbsd-amd64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-darwin-amd64:
@@ -93,7 +93,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-darwin-amd64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
   build-darwin-arm64:
@@ -106,7 +106,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1
     with:
       config-file: .github/slsa/.slsa-goreleaser-darwin-arm64.yml
-      go-version: 1.18
+      go-version: 1.21
       evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}"
       compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942
       
diff --git a/backend/server/Dockerfile b/backend/server/Dockerfile
index efbb351..dfbbab0 100644
--- a/backend/server/Dockerfile
+++ b/backend/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine3.17 AS builder
+FROM golang:1.21-alpine3.17 AS builder
 
 WORKDIR /app
 RUN apk add --update --no-cache --virtual .build-deps build-base 
diff --git a/go.mod b/go.mod
index 06f9ca6..fb6e6ff 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ddworken/hishtory
 
-go 1.18
+go 1.21
 
 require (
 	github.com/DataDog/datadog-go v4.8.3+incompatible