diff --git a/.drone.yml b/.drone.yml
index 699ca8a..ac80945 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,9 @@ steps:
     settings:
       purge: true
       repo: otakukaze/golang-base-image
+      username: otakukaze
+      password:
+        from_secret: password
       tags:
         - "${DRONE_BRANCH}"
     when:
@@ -24,6 +27,9 @@ steps:
     settings:
       purge: true
       repo: otakukaze/golang-base-image
+      username: otakukaze
+      password:
+        from_secret: password
       tags:
         - "1"
         - "latest"
diff --git a/Dockerfile b/Dockerfile
index 75651de..5bdb552 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
 ARG IMG_TAG=1
 FROM golang:${IMG_TAG}
 RUN go get -u github.com/go-bindata/go-bindata/... \
-  && go get -u github.com/go-swagger/go-swagger/...
+  && go get -u github.com/go-swagger/go-swagger/... \
+  && mv "$(go env GOPATH)/bin/go-bindata" /usr/bin \
+  && mv "$(go env GOPATH)/bin/swagger" /usr/bin
+