diff --git a/Makefile b/Makefile
index ef1ff1c94..c0931002a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ GO_HOST=$(NO_CROSS_COMP); $(GO)
 WITH_GO_HOST_ENV=$(NO_CROSS_COMP); $(GO_ENV)
 GO_BUILD_INSTALL_DEPS=-i
 GO_BUILD_TAGS='netgo unsafe'
-GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags $(GO_BUILD_TAGS)
+GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION) -s -w" -tags $(GO_BUILD_TAGS)
 
 
 all: $(SCOPE_EXPORT)
diff --git a/backend/Dockerfile b/backend/Dockerfile
index db2659c77..3a4910413 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.6.0
+FROM golang:1.6.1
 RUN apt-get update && \
 	apt-get install -y libpcap-dev python-requests time file && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*