diff --git a/modules/arm_plugin/Dockerfile.RPi32 b/modules/arm_plugin/Dockerfile.RPi32
index 80a6d7b6f8daba..ef95716b3717a5 100644
--- a/modules/arm_plugin/Dockerfile.RPi32
+++ b/modules/arm_plugin/Dockerfile.RPi32
@@ -90,6 +90,9 @@ RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/so
     && \
     rm -rf /var/lib/apt/lists/*
 
+RUN git config --global user.name "Your Name" && \
+    git config --global user.email "you@example.com"
+
 ENV ARCH_NAME arm-linux-gnueabihf
 ENV TOOLCHAIN_DEFS arm.toolchain.cmake
 COPY armplg_build.sh /armplg_build.sh
diff --git a/modules/arm_plugin/Dockerfile.RPi64 b/modules/arm_plugin/Dockerfile.RPi64
index b10248d2044b92..c4e8096a0ace31 100644
--- a/modules/arm_plugin/Dockerfile.RPi64
+++ b/modules/arm_plugin/Dockerfile.RPi64
@@ -65,6 +65,9 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
     && \
     rm -rf /var/lib/apt/lists/*
 
+RUN git config --global user.name "Your Name" && \
+    git config --global user.email "you@example.com"
+
 ENV ARCH_NAME aarch64-linux-gnu
 ENV TOOLCHAIN_DEFS arm64.toolchain.cmake
 COPY armplg_build.sh /armplg_build.sh
diff --git a/modules/arm_plugin/armplg_build.sh b/modules/arm_plugin/armplg_build.sh
index 6c335b8bf1419d..9b80e4e75a5350 100644
--- a/modules/arm_plugin/armplg_build.sh
+++ b/modules/arm_plugin/armplg_build.sh
@@ -89,7 +89,7 @@ mkdir -p $STAGING_DIR
 mkdir -p $OPENCV_HOME/build && \
 cd $OPENCV_HOME/build && \
 PYTHONVER=`ls /usr/include | grep "python3[^m]*$"` && \
-cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_LIST=imgcodecs,videoio,highgui,python3 \
+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_LIST=imgcodecs,videoio,highgui,gapi,python3 \
       -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=ON -DOPENCV_SKIP_PYTHON_LOADER=ON \
       -DPYTHON3_LIMITED_API=ON -DPYTHON3_PACKAGES_PATH=$STAGING_DIR/opencv/python \
       -DPYTHON3_INCLUDE_PATH=/usr/include/${PYTHONVER}m \