diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 923592b..3ab1fd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,11 @@ jobs:
     env:
       DEBIAN_FRONTEND: "noninteractive"
     steps:
+      - name: pre checkout info
+        run: |
+          whoami
+          pwd
+          ls -la
       - name: Checkout Megaboom
         uses: actions/checkout@v4
         with:
@@ -30,11 +35,11 @@ jobs:
         with:
           repository: antmicro/bazel-orfs
           path: bazel-orfs
-      - name: Checkout bazel-orfs
+      - name: post checkout info
         run: |
-          cd bazel-orfs
-          git checkout master
-          cd ../megaboom
+          whoami
+          pwd
+          ls -la
       - name: query target
         run: |
           bazel query ${{ matrix.TARGET }}
@@ -59,9 +64,25 @@ jobs:
     env:
       DEBIAN_FRONTEND: "noninteractive"
     steps:
-      - name: bazel-orfs setup
+      - name: pre checkout info
+        run: |
+          whoami
+          pwd
+          ls -la
+      - name: Checkout Megaboom
+        uses: actions/checkout@v4
+        with:
+          path: megaboom
+      - name: Clone bazel-orfs
+        uses: actions/checkout@v4
+        with:
+          repository: antmicro/bazel-orfs
+          path: bazel-orfs
+      - name: post checkout info
         run: |
-          git clone https://github.com/The-OpenROAD-Project/bazel-orfs.git ../bazel-orfs
+          whoami
+          pwd
+          ls -la
       - name: query target
         run: |
           bazel query ${{ matrix.TARGET }}
diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml
index 3c8156b..eea68f3 100644
--- a/.github/workflows/ci_docker.yml
+++ b/.github/workflows/ci_docker.yml
@@ -2,6 +2,7 @@ name: docker update
 
 on:
   workflow_dispatch:
+  push:
 
 jobs:
   docker:
diff --git a/Dockerfile b/Dockerfile
index c2391e3..3340e3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,12 @@
 FROM ubuntu:latest
 ENV DEBIAN_FRONTEND=noninteractive
 # Non-root user setup
-ARG USERNAME=tester
-ARG TESTER_HOME=/home/$USERNAME
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
+ARG USERNAME=root
+ARG TESTER_HOME=/root
 
-# Create the user
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    && apt-get update \
-    && apt-get install -y sudo \
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME
-
-# Set the default user to non-root one
-USER $USERNAME
-
-RUN sudo apt-get update -y
-RUN sudo apt-get upgrade -y
-RUN sudo apt-get install -y git vim wget python-is-python3
+RUN apt-get update -y
+RUN apt-get upgrade -y
+RUN apt-get install -y sudo git vim wget python-is-python3
 
 # Setup ORFS under ~
 WORKDIR $TESTER_HOME
@@ -36,5 +23,4 @@ RUN source ./env.sh && yosys -help && openroad -help && cd flow && make -j $(npr
 RUN sudo wget https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 -O /usr/local/bin/bazel
 RUN sudo chmod +x /usr/local/bin/bazel
 
-# Setup megaboom
 WORKDIR $TESTER_HOME