diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..70c5925
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+name: Build Docker Images
+
+on:
+  push:
+    branches: [ feature/first-bit]
+  pull_request:
+    branches: [ feature/first-bit]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy: 
+      matrix:
+        dir: [ 'jdk', 'oscript' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Build Docker images
+      run: |
+        docker build -t oscript:latest -f ${{ matrix.dir }}/Dockerfile .
diff --git a/oscript/Dockerfile b/oscript/Dockerfile
index 2817066..a48966a 100644
--- a/oscript/Dockerfile
+++ b/oscript/Dockerfile
@@ -37,7 +37,7 @@ RUN chmod +x /remove-dst-root-ca-x3.sh \
 
 # Installing oscript
 ARG OVM_REPOSITORY_OWNER=oscript-library
-ARG OVM_VERSION=v1.2.2
+ARG OVM_VERSION=v1.0.0-RC16
 ARG ONESCRIPT_VERSION=stable
 ARG ONESCRIPT_PACKAGES="add gitsync vanessa-runner stebi edt-ripper"