diff --git a/Dockerfile b/Dockerfile
index fbf8add..624994b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,4 +34,4 @@ COPY --from=build /opt/myriad .
 
 EXPOSE 8081
 
-ENTRYPOINT ["./myriad"]
\ No newline at end of file
+CMD ["./myriad"]
\ No newline at end of file
diff --git a/Dockerfile.release b/Dockerfile.release
index e5e0c43..95b951b 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -16,4 +16,4 @@ COPY --from=build /tmp/myriad .
 
 EXPOSE 8081
 
-ENTRYPOINT ["./myriad"]
\ No newline at end of file
+CMD ["./myriad"]
\ No newline at end of file
diff --git a/languages/arnoldc/Dockerfile b/languages/arnoldc/Dockerfile
new file mode 100644
index 0000000..214bfc5
--- /dev/null
+++ b/languages/arnoldc/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:17-alpine
+LABEL author="SunRed"
+
+RUN apk add --no-cache curl && \
+    curl -O http://lhartikk.github.io/ArnoldC.jar && \
+    mv ArnoldC.jar /var/run && \
+    apk del --no-cache curl
+
+COPY run.sh /var/run/
diff --git a/languages/arnoldc/run.sh b/languages/arnoldc/run.sh
new file mode 100644
index 0000000..cdf141f
--- /dev/null
+++ b/languages/arnoldc/run.sh
@@ -0,0 +1,2 @@
+cat > program.arnoldc
+java -jar /var/run/ArnoldC.jar program.arnoldc && java program
diff --git a/languages/brainfuck/Dockerfile b/languages/brainfuck/Dockerfile
index 34b74b3..067f601 100644
--- a/languages/brainfuck/Dockerfile
+++ b/languages/brainfuck/Dockerfile
@@ -1,12 +1,12 @@
 FROM alpine AS build
 
+RUN apk update && apk add g++
 COPY bf.cpp .
-RUN apk add --no-cache g++ && \
-    g++ bf.cpp -o bf
+RUN g++ bf.cpp -o bf
 
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache libstdc++
+RUN apk update && apk add libstdc++
 COPY --from=build bf /usr/local/bin/
 COPY run.sh /var/run/
diff --git a/languages/c/Dockerfile b/languages/c/Dockerfile
index 862b281..1324766 100644
--- a/languages/c/Dockerfile
+++ b/languages/c/Dockerfile
@@ -1,6 +1,7 @@
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache gcc libc-dev
+RUN apk update
+RUN apk add gcc libc-dev
 
 COPY run.sh /var/run/
diff --git a/languages/cpp/Dockerfile b/languages/cpp/Dockerfile
index 2242843..37bc37b 100644
--- a/languages/cpp/Dockerfile
+++ b/languages/cpp/Dockerfile
@@ -1,6 +1,7 @@
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache g++
+RUN apk update
+RUN apk add g++
 
 COPY run.sh /var/run/
diff --git a/languages/emojicode/Dockerfile b/languages/emojicode/Dockerfile
new file mode 100644
index 0000000..818bc71
--- /dev/null
+++ b/languages/emojicode/Dockerfile
@@ -0,0 +1,57 @@
+FROM debian:stable-slim as build
+
+ENV CC clang-8
+ENV CXX clang++-8
+ENV DEBIAN_FRONTEND=nontinteractive
+ENV PYTHONIOENCODING utf8
+
+RUN \
+  apt-get update && \
+  apt-get install -y \
+    gnupg \
+    wget && \
+  echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list && \
+  echo "deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list && \
+  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - && \
+  apt-get update && \
+  apt-get install -y \
+    clang-8 \
+    cmake \
+    libstdc++-8-dev \
+    libclang1-8 \
+    libclang-8-dev \
+    libclang-common-8-dev \
+    libfuzzer-8-dev \
+    libllvm8 \
+    libncurses-dev \
+    libz-dev \
+    llvm-8 \
+    llvm-8-dev \
+    llvm-runtime \
+    ninja-build \
+    python3 \
+    rsync \
+    git && \
+  rm -rf /var/lib/apt/lists/* && \
+  mkdir /tmp/emojicode/
+
+WORKDIR /tmp/emojicode/
+RUN git clone https://github.com/emojicode/emojicode.git .
+RUN cmake . -GNinja && \
+    ninja && \
+    ninja magicinstall
+
+
+FROM debian:stable-slim
+LABEL author="SunRed"
+
+ENV CXX=g++
+
+RUN apt-get update && \
+    apt-get install -y ${CXX} && \
+    apt-get autoremove -y && \
+    apt-get autoclean -y
+
+COPY --from=build /usr/local/bin /usr/local/bin
+COPY --from=build /usr/local/EmojicodePackages /usr/local/EmojicodePackages
+COPY run.sh /var/run/
diff --git a/languages/emojicode/run.sh b/languages/emojicode/run.sh
new file mode 100644
index 0000000..26188a7
--- /dev/null
+++ b/languages/emojicode/run.sh
@@ -0,0 +1,2 @@
+cat > program.emojic
+emojicodec program.emojic -o program && ./program
diff --git a/languages/haskell/Dockerfile b/languages/haskell/Dockerfile
index 6039727..ad6b169 100644
--- a/languages/haskell/Dockerfile
+++ b/languages/haskell/Dockerfile
@@ -1,17 +1,14 @@
-FROM debian:stable-slim
+FROM debian:stretch
 LABEL author="1Computer1"
 ENV LANG C.UTF-8
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \
-    echo 'deb https://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
+    apt-get install -y --no-install-recommends gnupg dirmngr && \
+    echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends ghc-9.0.1 && \
-    apt-get purge -y gnupg dirmngr ca-certificates && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get install -y --no-install-recommends ghc-8.6.5
 
-ENV PATH /opt/ghc/9.0.1/bin:$PATH
+ENV PATH /opt/ghc/8.6.5/bin:$PATH
 
 COPY run.sh /var/run/
diff --git a/languages/idris/Dockerfile b/languages/idris/Dockerfile
index 418b58f..04b8d8f 100644
--- a/languages/idris/Dockerfile
+++ b/languages/idris/Dockerfile
@@ -2,7 +2,6 @@ FROM alpine:latest
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
-    apk add idris@testing && \
-    rm -rf /var/cache/apk/*
+    apk add idris@testing
 
 COPY run.sh /var/run/
diff --git a/languages/java/Dockerfile b/languages/java/Dockerfile
index e78541e..dcc0975 100644
--- a/languages/java/Dockerfile
+++ b/languages/java/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-alpine
+FROM openjdk:13-alpine
 LABEL author="1Computer1"
 
 COPY run.sh /var/run/
diff --git a/languages/javascript/run.sh b/languages/javascript/run.sh
index faceee1..6e087ee 100644
--- a/languages/javascript/run.sh
+++ b/languages/javascript/run.sh
@@ -1 +1 @@
-cat | node
+cat | node -p
diff --git a/languages/lolcode/Dockerfile b/languages/lolcode/Dockerfile
new file mode 100644
index 0000000..9d5897a
--- /dev/null
+++ b/languages/lolcode/Dockerfile
@@ -0,0 +1,15 @@
+FROM alpine as build
+
+RUN apk add --no-cache build-base git cmake
+
+WORKDIR /tmp/lci
+RUN git clone https://github.com/justinmeza/lci.git .
+
+RUN cmake . && make
+
+
+FROM alpine
+LABEL author="SunRed"
+
+COPY --from=build /tmp/lci/lci /usr/local/bin
+COPY run.sh /var/run/
diff --git a/languages/lolcode/run.sh b/languages/lolcode/run.sh
new file mode 100644
index 0000000..82fcf02
--- /dev/null
+++ b/languages/lolcode/run.sh
@@ -0,0 +1,2 @@
+cat > program.lol
+lci program.lol
diff --git a/languages/lua/Dockerfile b/languages/lua/Dockerfile
index c15ec01..0835675 100644
--- a/languages/lua/Dockerfile
+++ b/languages/lua/Dockerfile
@@ -1,5 +1,6 @@
 FROM alpine
 
-RUN apk add --no-cache lua5.3
+RUN apk update
+RUN apk add lua5.3
 
 COPY run.sh /var/run/
diff --git a/languages/typescript/run.sh b/languages/typescript/run.sh
index 4fccb05..4d12a04 100644
--- a/languages/typescript/run.sh
+++ b/languages/typescript/run.sh
@@ -1,4 +1,4 @@
 cat > program.ts
 tsc --lib DOM,ESNext --target ES2019 --strict \
     --skipLibCheck --types /usr/local/share/.config/yarn/global/node_modules/@types/node program.ts \
-    && cat program.js | node
+    && cat program.js | node -p 
diff --git a/src/Myriad/Docker.hs b/src/Myriad/Docker.hs
index 3e67655..e94b809 100644
--- a/src/Myriad/Docker.hs
+++ b/src/Myriad/Docker.hs
@@ -40,19 +40,13 @@ data EvalResult
 buildImage :: Language -> Myriad ()
 buildImage lang = do
     env <- ask
-    logInfo ["Checking for image ", cs $ imageName lang]
-    res <- try $ exec ["docker images -q ", imageName lang]
-    case res of
-        Left (SomeException err) -> logError ["An exception occured when checking for image ", cs $ imageName lang, ":\n", cs $ show err]
-        Right s -> do
-            when (BL.null s) . void $ do -- If string is empty that means the image does not yet exist
-                logInfo ["Building image ", cs $ imageName lang]
-                exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) </> cs (lang ^. #name)]
-                logInfo ["Built image ", cs $ imageName lang]
-            setupQSems
-            when (env ^. #config % #prepareContainers) . void $ setupContainer lang
+    logInfo ["Building image ", cs $ imageName lang]
+    exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) </> cs (lang ^. #name)]
+    setupQSems
+    logInfo ["Built image ", cs $ imageName lang]
+    when (env ^. #config % #prepareContainers) . void $ setupContainer lang
     where
-        setupQSems :: Myriad ()
+        setupQSems ::  Myriad ()
         setupQSems = do
             env <- ask
             csem <- newQSem 1 -- We only want one container to be set up at a time