diff --git a/.gitignore b/.gitignore
index a1aeb7a..e8b0e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,5 +136,5 @@ zz_generated.openapi.go
 *.pyc
 
 # binaries
-./openstack-cloud-controller-manager
-./cinder-flex-volume-driver
\ No newline at end of file
+/openstack-cloud-controller-manager
+/cinder-flex-volume-driver
\ No newline at end of file
diff --git a/Makefile b/Makefile
index c0e4a5f..1fa7de0 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,13 @@ shell: work
 
 build-image: build
 ifeq ($(GOOS),linux)
-	docker build -t $(REGISTRY)/openstack-cloud-controller-manager:$(VERSION) .
+	cp openstack-cloud-controller-manager cluster/images/controller-manager
+	docker build -t $(REGISTRY)/openstack-cloud-controller-manager:$(VERSION) cluster/images/controller-manager
+	rm cluster/images/controller-manager/openstack-cloud-controller-manager
+
+	cp cinder-flex-volume-driver cluster/images/flex-volume-driver
+	docker build -t $(REGISTRY)/cinder-flex-volume-driver:$(VERSION) cluster/images/flex-volume-driver
+	rm cluster/images/flex-volume-driver/cinder-flex-volume-driver
 else
 	$(error Please set GOOS=linux for building the image)
 endif
diff --git a/Dockerfile b/cluster/images/controller-manager/Dockerfile
similarity index 100%
rename from Dockerfile
rename to cluster/images/controller-manager/Dockerfile
diff --git a/manifests/flex-volume-driver/Dockerfile b/cluster/images/flex-volume-driver/Dockerfile
similarity index 91%
rename from manifests/flex-volume-driver/Dockerfile
rename to cluster/images/flex-volume-driver/Dockerfile
index f58e0b0..72b452c 100644
--- a/manifests/flex-volume-driver/Dockerfile
+++ b/cluster/images/flex-volume-driver/Dockerfile
@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.6
-
-MAINTAINER frakti team
+FROM alpine:3.7
 
 # add bash
 RUN apk --no-cache add bash
 
 WORKDIR /flexvolume
  
-COPY flexvolume_driver .
+COPY cinder-flex-volume-driver .
 COPY cinder.conf.default cinder.conf.tmp
 COPY install.sh .
diff --git a/manifests/flex-volume-driver/cinder.conf.default b/cluster/images/flex-volume-driver/cinder.conf.default
similarity index 100%
rename from manifests/flex-volume-driver/cinder.conf.default
rename to cluster/images/flex-volume-driver/cinder.conf.default
diff --git a/manifests/flex-volume-driver/flexvolume-ds.yaml b/cluster/images/flex-volume-driver/flexvolume-ds.yaml
similarity index 97%
rename from manifests/flex-volume-driver/flexvolume-ds.yaml
rename to cluster/images/flex-volume-driver/flexvolume-ds.yaml
index be35924..0027e46 100644
--- a/manifests/flex-volume-driver/flexvolume-ds.yaml
+++ b/cluster/images/flex-volume-driver/flexvolume-ds.yaml
@@ -20,7 +20,6 @@ spec:
         k8s-app: cinder-flexvolume
         name: cinder-flexvolume
       annotations:
-        runtime.frakti.alpha.kubernetes.io/OSContainer: "true"
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: |
           [{"key": "dedicated", "value": "master", "effect": "NoSchedule" },
diff --git a/manifests/flex-volume-driver/install.sh b/cluster/images/flex-volume-driver/install.sh
similarity index 97%
rename from manifests/flex-volume-driver/install.sh
rename to cluster/images/flex-volume-driver/install.sh
index ebf3f68..8e2ebf6 100755
--- a/manifests/flex-volume-driver/install.sh
+++ b/cluster/images/flex-volume-driver/install.sh
@@ -22,7 +22,7 @@ trap 'exit' TERM
 
 # WORKDIR /flexvolume
 TMP_CONF='cinder.conf.tmp'
-VOL_BINARY='flexvolume_driver'
+VOL_BINARY='cinder-flex-volume-driver'
 
 VOL_BINARY_DIR='/mnt/binary'