diff --git a/golang/latest/Dockerfile b/golang/latest/Dockerfile
index ae4e08495de63878397c76902a1846e5329e732b..355a75ab6dd400d30a0d3f4b13df4b88971a3a4a 100644
--- a/golang/latest/Dockerfile
+++ b/golang/latest/Dockerfile
@@ -7,7 +7,7 @@ LABEL version="1.0"
 # Install golint
 ENV GOPATH /go
 ENV PATH ${GOPATH}/bin:$PATH
-RUN go get -u github.com/golang/lint/golint
+RUN go get -u golang.org/x/lint/golint
 
 # Add apt key for LLVM repository
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/php/5.3/Dockerfile b/php/5.3/Dockerfile
index 6b4a712ff5b890e4f73ee56d558a5b0f1b80ae38..1a613b49004f7189534972f37dc2748e0a239c1b 100644
--- a/php/5.3/Dockerfile
+++ b/php/5.3/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev libmysqlclient-dev libfreetype6-dev libjpeg-dev libxpm-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev libmysqlclient-dev libfreetype6-dev libjpeg-dev libxpm-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/php/5.6/Dockerfile b/php/5.6/Dockerfile
index e895f857a4024f2cb6876efa1bbac6278b6851a4..cfce365dc11ab783115dba4a1a510fdc27e8a590 100644
--- a/php/5.6/Dockerfile
+++ b/php/5.6/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/php/7.0/Dockerfile b/php/7.0/Dockerfile
index 48283e75da32997a06d47de15e485aabbcda1c20..1ee78539277243938a7f8d1e49159198ea1bd6fb 100644
--- a/php/7.0/Dockerfile
+++ b/php/7.0/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/php/7.1/Dockerfile b/php/7.1/Dockerfile
index 816f0eb0cc1181a0f28d0ccceafc6bd4f28ddb13..c3db66b0e5b9efebc7122641f1b4fd7ec1376448 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/php/7.2/Dockerfile b/php/7.2/Dockerfile
index 4d0b94709ae157dc0bddc9ad03a3a0141acbda26..32c0f8cf3af165acb2d2a6603ff554e821067826 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/php/7.3/Dockerfile b/php/7.3/Dockerfile
index 847c4c774514c467d9b5bee6effcd09fcdd88cbb..2bc2db36551b4e4a6b3133551bae3e77b4e013a0 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip subversion mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install lsb-release zip unzip subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev --fix-missing --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*