diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index f174244..22886d9 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -14,7 +14,7 @@ jobs:
     outputs:
       any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
       fedora: ${{ steps.filter.outputs.fedora == 'true' }}
-      php: ${{ steps.filter.outputs.php == 'true' }}
+      go: ${{ steps.filter.outputs.go == 'true' }}
       rust: ${{ steps.filter.outputs.rust == 'true' }}
       dotnet: ${{ steps.filter.outputs.dotnet == 'true' }}
     steps:
@@ -25,7 +25,7 @@ jobs:
           filters: |
             workflow: ['.gitea/workflows/build.yaml']
             fedora: ['containers/fedora/**']
-            php: ['containers/php/**']
+            go: ['containers/go/**']
             rust: ['containers/rust/**']
             dotnet: ['containers/dotnet/**']
 
@@ -68,12 +68,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: [php, rust, dotnet]
+        container: [rust, dotnet, go]
     steps:
       - name: Check if build needed
         id: check
         run: |
-          if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
+          if [[ "${{ matrix.container }}" == "go" && "${{ needs.changes.outputs.go }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
           if [[ "${{ matrix.container }}" == "rust" && "${{ needs.changes.outputs.rust }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
           if [[ "${{ matrix.container }}" == "dotnet" && "${{ needs.changes.outputs.dotnet }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
           if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
diff --git a/.gitea/workflows/other.yaml b/.gitea/workflows/other.yaml
index 4c0d18f..6b15d84 100644
--- a/.gitea/workflows/other.yaml
+++ b/.gitea/workflows/other.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        container: [rider, kali, android]
+        container: [rider]
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
diff --git a/containers/go/Containerfile b/containers/go/Containerfile
new file mode 100644
index 0000000..9275aa2
--- /dev/null
+++ b/containers/go/Containerfile
@@ -0,0 +1,7 @@
+FROM git.plabble.org/maurice/fedora:main
+
+USER root
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf -y --setopt=keepcache=1 install go
+
+USER user
\ No newline at end of file
diff --git a/containers/kali/Containerfile b/containers/kali/Containerfile
deleted file mode 100644
index e285302..0000000
--- a/containers/kali/Containerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM docker.io/kalilinux/kali-rolling
-
-RUN apt update && apt -y install kali-linux-headless
-VOLUME /root
\ No newline at end of file
diff --git a/containers/kali/start.sh b/containers/kali/start.sh
deleted file mode 100644
index abde266..0000000
--- a/containers/kali/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-arg "-v kali-root:/root"
\ No newline at end of file
diff --git a/containers/php/Containerfile b/containers/php/Containerfile
deleted file mode 100644
index 9d46528..0000000
--- a/containers/php/Containerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM git.plabble.org/maurice/fedora:main
-ARG php_version="8.5"
-
-RUN /bin/bash -c "export TERM=xterm && $(curl -fsSL https://php.new/install/linux/${php_version})"
diff --git a/containers/php/config.sh b/containers/php/config.sh
deleted file mode 100644
index 764f6c2..0000000
--- a/containers/php/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-arg "--cap-add=NET_BIND_SERVICE -p 80:80"