diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index edef019155..66d89393c3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -395,8 +395,8 @@ jobs:
               - 'images/echo/**'
             go-grpc-greeter-server:
               - 'images/go-grpc-greeter-server/**'
-            httpbin:
-              - 'images/httpbin/**'
+            httpbun:
+              - 'images/httpbun/**'
             kube-webhook-certgen:
               - 'images/kube-webhook-certgen/**'
             ext-auth-example-authsvc:
@@ -422,10 +422,10 @@ jobs:
         if: ${{ steps.filter-images.outputs.go-grpc-greeter-server == 'true' }}
         run: |
           cd images/go-grpc-greeter-server && make build
-      - name: httpbin image build
+      - name: httpbun image build
         if: ${{ steps.filter-images.outputs.httpbin == 'true' }}
         run: |
-          cd images/httpbin && make build
+          cd images/httpbun && make build
       - name: kube-webhook-certgen image build
         if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
         run: |
diff --git a/images/README.md b/images/README.md
index 13f6bfc3ce..cdcb9574b7 100644
--- a/images/README.md
+++ b/images/README.md
@@ -17,6 +17,7 @@ custom-error-pages | Example of Custom error pages for the NGINX Ingress control
 e2e | Image to run e2e tests
 fastcgi-helloserver | FastCGI application for e2e tests
 grpc-fortune-teller | grpc server application for the nginx-ingress grpc example
-httpbin | A simple HTTP Request & Response Service for e2e tests
+httpbun | A simple HTTP Request & Response Service for e2e tests
+httpbin | [Removed] we are no longer maintaining the httpbin image due to project being unmaintained 
 nginx | NGINX base image using [alpine linux](https://www.alpinelinux.org)
 cfssl | Image to run cfssl commands
diff --git a/images/httpbin/Makefile b/images/httpbun/Makefile
similarity index 97%
rename from images/httpbin/Makefile
rename to images/httpbun/Makefile
index a2ba074003..bcb8c7be22 100644
--- a/images/httpbin/Makefile
+++ b/images/httpbun/Makefile
@@ -23,7 +23,7 @@ TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
 
 REGISTRY ?= local
 
-IMAGE = $(REGISTRY)/e2e-test-httpbin
+IMAGE = $(REGISTRY)/e2e-test-httpbun
 
 # required to enable buildx
 export DOCKER_CLI_EXPERIMENTAL=enabled
diff --git a/images/httpbin/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml
similarity index 94%
rename from images/httpbin/cloudbuild.yaml
rename to images/httpbun/cloudbuild.yaml
index e9df202b81..9e3af5935e 100644
--- a/images/httpbin/cloudbuild.yaml
+++ b/images/httpbun/cloudbuild.yaml
@@ -18,7 +18,7 @@ steps:
     - -c
     - |
       gcloud auth configure-docker \
-      && cd images/httpbin && make push
+      && cd images/httpbun && make push
 substitutions:
   _GIT_TAG: "12345"
   _PULL_BASE_REF: "master"
diff --git a/images/httpbin/rootfs/Dockerfile b/images/httpbun/rootfs/Dockerfile
similarity index 61%
rename from images/httpbin/rootfs/Dockerfile
rename to images/httpbun/rootfs/Dockerfile
index a05f6872f0..a1775d303b 100644
--- a/images/httpbin/rootfs/Dockerfile
+++ b/images/httpbun/rootfs/Dockerfile
@@ -12,21 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.17.2
+FROM golang:1.20 AS builder
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
+ENV HTTPBUN_COMMIT=a6b387c438b664322734250e426b6966966c2fe4
 
-RUN apk upgrade && apk update \
-  && apk add --no-cache \
-    python3 python3-dev \
-    musl-dev gcc g++ make \
-    libffi libffi-dev libstdc++ \
-    py3-gevent py3-gunicorn py3-wheel \
-    py3-pip \
- && pip3 install httpbin \
- && apk del python3-dev musl-dev gcc g++ make libffi-dev
+RUN git clone https://github.com/sharat87/httpbun.git
+WORKDIR httpbun
+RUN git checkout $HTTPBUN_COMMIT
 
-EXPOSE 80
+RUN CGO_ENABLED=0 GOOS=linux go build \
+    -installsuffix cgo \
+    -trimpath \
+    -o bin/httpbun .
 
-CMD ["gunicorn", "-b", "0.0.0.0:80", "httpbin:app", "-k", "gevent"]
+FROM scratch
+COPY --from=builder /go/httpbun/bin/httpbun httpbun
+ENV HTTPBUN_BIND=0.0.0.0:80
+EXPOSE 80
+ENTRYPOINT ["/httpbun"]