diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index d25bcd3d..a4b85af1 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -24,7 +24,7 @@ RUN apk --no-cache --update add \
   py3-scipy \
   py3-pip \
   go~=1.20 \
-  nodejs \ 
+  nodejs \
   yarn \
   dotnet7-sdk
 
diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile
index fa1857be..75117158 100644
--- a/build/docker/debian.Dockerfile
+++ b/build/docker/debian.Dockerfile
@@ -35,7 +35,11 @@ RUN apt -y update && apt -y upgrade && apt -y install openjdk-11-jre \
     gnupg \
     python3-pip && \
     apt -y install -t testing golang-1.20 && \
-    apt -y clean && rm -rf /var/lib/apt/lists/*
+    apt -y clean && rm -rf /var/lib/apt/lists/* && \
+    # Symlink pip3 to pip, we assume that "pip" works in CLI
+    ln -sf /usr/bin/pip3 /usr/bin/pip && \
+    # Symlink go binary to bin directory which is in path
+    ln -s /usr/lib/go-1.20/bin/go /usr/bin/go
 
 RUN mkdir -p /etc/apt/keyrings