diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml
index b3027ec..bb264a3 100644
--- a/.github/workflows/package-pr.yaml
+++ b/.github/workflows/package-pr.yaml
@@ -55,7 +55,9 @@ jobs:
         run: |
           PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u)
           echo "Packages: $PACKAGES"
-          docker run -v "${{ github.workspace }}:/piston" docker.pkg.github.com/engineer-man/piston/repo-builder:latest --no-server $PACKAGES
+          docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
+          docker build -t repo-builder repo
+          docker run -v "${{ github.workspace }}:/piston" repo-builder --no-server $PACKAGES
           ls -la packages
 
       - name: Upload package as artifact
@@ -89,7 +91,9 @@ jobs:
         run: |
           ls -la
           docker run -v $(pwd)'/repo:/piston/repo' -v $(pwd)'/packages:/piston/packages' -d --name repo docker.pkg.github.com/engineer-man/piston/repo-builder --no-build
-          docker run --network container:repo -v $(pwd)'/data:/piston' -e PISTON_LOG_LEVEL=DEBUG -e 'PISTON_REPO_URL=http://localhost:8000/index' -d --name api docker.pkg.github.com/engineer-man/piston/api
+          docker pull docker.pkg.github.com/engineer-man/piston/api
+          docker build -t piston-api api
+          docker run --network container:repo -v $(pwd)'/data:/piston' -e PISTON_LOG_LEVEL=DEBUG -e 'PISTON_REPO_URL=http://localhost:8000/index' -d --name api piston-api
           echo Waiting for API to start..
           docker run --network container:api appropriate/curl -s --retry 10 --retry-connrefused http://localhost:2000/api/v2/runtimes
 
diff --git a/.github/workflows/package-push.yaml b/.github/workflows/package-push.yaml
index ad33f3e..bbb44af 100644
--- a/.github/workflows/package-push.yaml
+++ b/.github/workflows/package-push.yaml
@@ -33,7 +33,9 @@ jobs:
         run: |
           PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u)
           echo "Packages: $PACKAGES"
-          docker run -v "${{ github.workspace }}:/piston" docker.pkg.github.com/engineer-man/piston/repo-builder:latest --no-server $PACKAGES
+          docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
+          docker build -t repo-builder repo
+          docker run -v "${{ github.workspace }}:/piston" repo-builder --no-server $PACKAGES
           ls -la packages
 
       - name: Upload Packages
@@ -73,4 +75,4 @@ jobs:
           file: index
           tag: pkgs
           overwrite: true
-          file_glob: true
\ No newline at end of file
+          file_glob: true
diff --git a/api/Dockerfile b/api/Dockerfile
index 668c54a..ec0d2a8 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && \
     libncurses6 libncurses5 libedit-dev libseccomp-dev rename procps python3 \
     libreadline-dev libblas-dev liblapack-dev libpcre3-dev libarpack2-dev \
     libfftw3-dev libglpk-dev libqhull-dev libqrupdate-dev libsuitesparse-dev \
-    libsundials-dev && \
+    libsundials-dev libpcre2-dev && \
     rm -rf /var/lib/apt/lists/*
 
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
diff --git a/cli/package-lock.json b/cli/package-lock.json
index d564e5f..ad65043 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -9,7 +9,7 @@
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
-                "axios": "^0.21.1",
+                "axios": "^0.21.2",
                 "chalk": "^4.1.0",
                 "minimatch": "^3.0.4",
                 "nocamel": "^1.0.2",
@@ -37,11 +37,11 @@
             }
         },
         "node_modules/axios": {
-            "version": "0.21.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-            "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+            "version": "0.21.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
+            "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
             "dependencies": {
-                "follow-redirects": "^1.10.0"
+                "follow-redirects": "^1.14.0"
             }
         },
         "node_modules/balanced-match": {
@@ -115,11 +115,22 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.13.3",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
-            "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==",
+            "version": "1.14.3",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+            "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
             "engines": {
                 "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
             }
         },
         "node_modules/get-caller-file": {
@@ -297,11 +308,11 @@
             }
         },
         "axios": {
-            "version": "0.21.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-            "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+            "version": "0.21.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
+            "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
             "requires": {
-                "follow-redirects": "^1.10.0"
+                "follow-redirects": "^1.14.0"
             }
         },
         "balanced-match": {
@@ -366,9 +377,9 @@
             "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
         },
         "follow-redirects": {
-            "version": "1.13.3",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
-            "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
+            "version": "1.14.3",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+            "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
         },
         "get-caller-file": {
             "version": "2.0.5",
diff --git a/cli/package.json b/cli/package.json
index 6df989d..c244403 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -5,7 +5,7 @@
     "main": "index.js",
     "license": "MIT",
     "dependencies": {
-        "axios": "^0.21.1",
+        "axios": "^0.21.2",
         "chalk": "^4.1.0",
         "minimatch": "^3.0.4",
         "nocamel": "^1.0.2",
diff --git a/packages/mono/6.12.0/compile b/packages/mono/6.12.0/compile
index 5246bc2..e3ae230 100644
--- a/packages/mono/6.12.0/compile
+++ b/packages/mono/6.12.0/compile
@@ -1,13 +1,20 @@
 #!/bin/bash
 
+check_errors () {
+    grep -q 'error [A-Z]\+[0-9]\+:' check.txt && cat check.txt 1>&2 || cat check.txt
+    rm check.txt
+}
+
 case "${PISTON_LANGUAGE}" in
     csharp)
         rename 's/$/\.cs/' "$@" # Add .cs extension
-        csc -out:out *.cs
+        csc -out:out *.cs > check.txt
+        check_errors
         ;;
     basic)
         rename 's/$/\.vb/' "$@" # Add .vb extension
-        vbnc -out:out *.vb
+        vbnc -out:out *.vb > check.txt
+        check_errors
         ;;
     *)
         echo "How did you get here? (${PISTON_LANGUAGE})"
diff --git a/packages/rscript/4.1.1/build.sh b/packages/rscript/4.1.1/build.sh
new file mode 100755
index 0000000..9837c22
--- /dev/null
+++ b/packages/rscript/4.1.1/build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+PREFIX=$(realpath $(dirname $0))
+
+mkdir build
+cd build
+
+curl https://cloud.r-project.org/src/base/R-4/R-4.1.1.tar.gz -o R.tar.gz
+tar xzf R.tar.gz --strip-components 1
+
+./configure --prefix="$PREFIX" --with-x=no
+make -j$(nproc)
+make install -j$(nproc)
+
+cd ../
+rm -rf build
diff --git a/packages/rscript/4.1.1/environment b/packages/rscript/4.1.1/environment
new file mode 100644
index 0000000..977a5e8
--- /dev/null
+++ b/packages/rscript/4.1.1/environment
@@ -0,0 +1 @@
+export PATH=$PWD/bin:$PATH
diff --git a/packages/rscript/4.1.1/metadata.json b/packages/rscript/4.1.1/metadata.json
new file mode 100644
index 0000000..db16a76
--- /dev/null
+++ b/packages/rscript/4.1.1/metadata.json
@@ -0,0 +1,5 @@
+{
+    "language": "rscript",
+    "version": "4.1.1",
+    "aliases": ["r"]
+}
diff --git a/packages/rscript/4.1.1/run b/packages/rscript/4.1.1/run
new file mode 100644
index 0000000..d122eb8
--- /dev/null
+++ b/packages/rscript/4.1.1/run
@@ -0,0 +1,2 @@
+#/bin/bash
+Rscript "$@"
diff --git a/packages/rscript/4.1.1/test.r b/packages/rscript/4.1.1/test.r
new file mode 100644
index 0000000..9273f27
--- /dev/null
+++ b/packages/rscript/4.1.1/test.r
@@ -0,0 +1 @@
+cat('OK')
diff --git a/readme.md b/readme.md
index 919025c..f43f70a 100644
--- a/readme.md
+++ b/readme.md
@@ -356,6 +356,7 @@ Content-Type: application/json
 `python2`,
 `raku`,
 `rockstar`,
+`rscript`,
 `ruby`,
 `rust`,
 `scala`,
diff --git a/repo/Dockerfile b/repo/Dockerfile
index 106fef4..56ca59d 100644
--- a/repo/Dockerfile
+++ b/repo/Dockerfile
@@ -8,7 +8,8 @@ RUN apt-get update && apt-get install -y unzip autoconf build-essential libssl-d
         util-linux pciutils usbutils coreutils binutils findutils grep libncurses5-dev \
         libncursesw5-dev python3-pip libgmp-dev libmpfr-dev python2 libffi-dev gfortran\
         libreadline-dev libblas-dev liblapack-dev libpcre3-dev libarpack2-dev libfftw3-dev \
-        libglpk-dev libqhull-dev libqrupdate-dev libsuitesparse-dev libsundials-dev && \
+        libglpk-dev libqhull-dev libqrupdate-dev libsuitesparse-dev libsundials-dev \
+        libbz2-dev liblzma-dev libpcre2-dev && \
         ln -sf /bin/bash /bin/sh && \
         rm -rf /var/lib/apt/lists/* && \
         update-alternatives --install /usr/bin/python python /usr/bin/python3.7 2
@@ -17,4 +18,3 @@ ADD entrypoint.sh mkindex.sh /
 
 ENTRYPOINT ["bash","/entrypoint.sh"]
 CMD ["--no-build"]
-