diff --git a/linux/advanced/vscode-server/amxx/1.10/Dockerfile b/linux/advanced/vscode-server/amxx/1.10/Dockerfile
index 8978f9853..14968e525 100644
--- a/linux/advanced/vscode-server/amxx/1.10/Dockerfile
+++ b/linux/advanced/vscode-server/amxx/1.10/Dockerfile
@@ -40,7 +40,6 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     chmod +x $AMXX_BIN_PATH/compile.sh
 
diff --git a/linux/advanced/vscode-server/amxx/1.9/Dockerfile b/linux/advanced/vscode-server/amxx/1.9/Dockerfile
index 991ccb5b5..1704a077e 100644
--- a/linux/advanced/vscode-server/amxx/1.9/Dockerfile
+++ b/linux/advanced/vscode-server/amxx/1.9/Dockerfile
@@ -39,7 +39,6 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh
diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
index 0ea462726..024cb78fe 100644
--- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
@@ -32,7 +32,7 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
+    chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     amxxpc --help 2>&1 | head -n 1
 
diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
index 455ade5c8..7bfeb45b2 100644
--- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
@@ -18,9 +18,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV AMXX_VERSION=1.9
 ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
 ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
+ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include
 ENV PATH=$PATH:$AMXX_BIN_PATH
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH
 
+COPY inc.tar /tmp
+
 RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
     mkdir -p $AMXX_INSTALL_PATH && \
     curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
@@ -28,6 +31,9 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh && \
+    tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
+    chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
+    chmod -R 700 $AMXX_INC_PATH && \
     amxxpc --help 2>&1 | head -n 1
 
 ##################################################################