diff --git a/.github/DockerfileBackendTests b/.github/DockerfileBackendTests
index f77f996bd7..639e269c5c 100644
--- a/.github/DockerfileBackendTests
+++ b/.github/DockerfileBackendTests
@@ -1,8 +1,4 @@
-ARG RUST_IMAGE=rust:1.80-slim-bookworm
-ARG PYTHON_IMAGE=python:3.11.4-slim-bookworm
-
-
-FROM ${RUST_IMAGE} as builder
+FROM ubuntu
 
 RUN apt-get update && apt-get install -y git libssl-dev pkg-config
 
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 5498ef400b..3b70e25ee8 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -37,9 +37,7 @@ permissions: write-all
 jobs:
   build:
     runs-on: ubicloud-standard-30
-    if:
-      (github.event_name != 'workflow_dispatch') || (github.event.inputs.ee ==
-      false)
+    if: (github.event_name != 'workflow_dispatch') || (inputs.ee == false)
     steps:
       - uses: actions/checkout@v4
         with:
@@ -102,9 +100,7 @@ jobs:
 
   build_arm:
     runs-on: ubicloud-standard-30-arm
-    if:
-      (github.event_name != 'workflow_dispatch') || (github.event.inputs.ee ==
-      false)
+    if: (github.event_name != 'workflow_dispatch') || (inputs.ee == false)
     steps:
       - uses: actions/checkout@v4
         with:
@@ -167,9 +163,7 @@ jobs:
 
   build_ee:
     runs-on: ubicloud
-    if:
-      (github.event_name != 'workflow_dispatch') || (github.event.inputs.ee ==
-      true)
+    if: (github.event_name != 'workflow_dispatch') || (inputs.ee == true)
     steps:
       - uses: actions/checkout@v4
         with: