diff --git a/README.md b/README.md
index 9c81fb7..d258deb 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,9 @@ console.log(new Foo().bar);
 
 One of the following languages is set in `lang`.
 
-- `js` JavaScript (Node 10.14.2)
-- `py` Python (CPython 3.6.8, CPython 2.7.15)
-- `hs` Haskell (GHC 8.4.3)
+- `js` JavaScript (Node 11.11.0)
+- `py` Python (CPython 3.7.2, CPython 2.7.16)
+- `hs` Haskell (GHC 8.6.3)
 - `pas` Pascal (FPC 3.0.4)
 - `go` Go (Go 1.12)
 
diff --git a/docker/haskell/Dockerfile b/docker/haskell/Dockerfile
index 457fd88..dcd5d01 100644
--- a/docker/haskell/Dockerfile
+++ b/docker/haskell/Dockerfile
@@ -1,8 +1,5 @@
-FROM alpine
+FROM haskell
 LABEL author="1Computer1"
 
-RUN apk update
-RUN apk add build-base ghc
-
 COPY run.sh /var/run/
 WORKDIR /var/ws
diff --git a/docker/javascript/Dockerfile b/docker/javascript/Dockerfile
index 690bf18..200d38f 100644
--- a/docker/javascript/Dockerfile
+++ b/docker/javascript/Dockerfile
@@ -1,8 +1,5 @@
-FROM alpine
+FROM node:alpine
 LABEL author="1Computer1"
 
-RUN apk update
-RUN apk add nodejs
-
 COPY run.sh /var/run/
 WORKDIR /var/ws
diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile
index f71d20a..97bb3b4 100644
--- a/docker/python2/Dockerfile
+++ b/docker/python2/Dockerfile
@@ -1,8 +1,5 @@
-FROM alpine
+FROM python:2-alpine
 LABEL author="1Computer1"
 
-RUN apk update
-RUN apk add build-base python2
-
 COPY run.sh /var/run/
 WORKDIR /var/ws
diff --git a/docker/python/Dockerfile b/docker/python3/Dockerfile
similarity index 57%
rename from docker/python/Dockerfile
rename to docker/python3/Dockerfile
index 1ca7d5c..614478e 100644
--- a/docker/python/Dockerfile
+++ b/docker/python3/Dockerfile
@@ -1,8 +1,5 @@
-FROM alpine
+FROM python:3-alpine
 LABEL author="1Computer1"
 
-RUN apk update
-RUN apk add python3
-
 COPY run.sh /var/run/
 WORKDIR /var/ws
diff --git a/docker/python/run.sh b/docker/python3/run.sh
similarity index 54%
rename from docker/python/run.sh
rename to docker/python3/run.sh
index 182146a..f07bd5a 100644
--- a/docker/python/run.sh
+++ b/docker/python3/run.sh
@@ -1,2 +1,2 @@
 echo "$1" > program.py
-python3 program.py
+python program.py
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 16aa887..8444cdf 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -2,9 +2,9 @@ const Language = require('../struct/Language');
 
 class JavaScript extends Language {
     constructor() {
-        super('javaScript', {
+        super('javascript', {
             highlight: 'js',
-            aliases: ['javaScript', 'js'],
+            aliases: ['javascript', 'js'],
             options: {
                 harmony: () => ''
             }
diff --git a/src/languages/python.js b/src/languages/python.js
index 3d5f0c3..37e33c8 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -5,7 +5,7 @@ class Python extends Language {
         super('python', {
             highlight: 'py',
             aliases: ['python', 'py'],
-            loads: ['python', 'python2'],
+            loads: ['python3', 'python2'],
             options: {
                 2: () => ''
             }
@@ -17,7 +17,7 @@ class Python extends Language {
             return { id: 'python2', env: {} };
         }
 
-        return { id: 'python', env: {} };
+        return { id: 'python3', env: {} };
     }
 }