diff --git a/.gitignore b/.gitignore
index 41552caa6..2eaa6e132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 
 # docker build
 /deploy/rbd/docker/rbdplugin
-/deploy/cephfs/docker/rbdplugin
+/deploy/cephfs/docker/cephfsplugin
 
 # Emacs save files
 *~
diff --git a/cephfs/main.go b/cephfs/main.go
index 1d0cc9aac..dd26796c1 100644
--- a/cephfs/main.go
+++ b/cephfs/main.go
@@ -21,7 +21,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/ceph/ceph-csi/pkg/cephfs"
+	// "github.com/ceph/ceph-csi/pkg/cephfs"
+	"github.com/gman0/ceph-csi/pkg/cephfs"
 	"github.com/golang/glog"
 )
 
diff --git a/deploy/cephfs/kubernetes/cephfsplugin.yaml b/deploy/cephfs/kubernetes/cephfsplugin.yaml
index 0c79a4289..bbfc58b32 100644
--- a/deploy/cephfs/kubernetes/cephfsplugin.yaml
+++ b/deploy/cephfs/kubernetes/cephfsplugin.yaml
@@ -49,7 +49,7 @@ spec:
       hostNetwork: true
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:latest
+          image: quay.io/k8scsi/driver-registrar:v0.2.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/cephfs/kubernetes/csi-attacher.yaml b/deploy/cephfs/kubernetes/csi-attacher.yaml
index efb8278ac..9aeb6c33c 100644
--- a/deploy/cephfs/kubernetes/csi-attacher.yaml
+++ b/deploy/cephfs/kubernetes/csi-attacher.yaml
@@ -66,7 +66,7 @@ spec:
       serviceAccount: csi-attacher
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:latest
+          image: quay.io/k8scsi/csi-attacher:v0.2.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/cephfs/kubernetes/csi-provisioner.yaml b/deploy/cephfs/kubernetes/csi-provisioner.yaml
index 9c2040c23..04d71faca 100644
--- a/deploy/cephfs/kubernetes/csi-provisioner.yaml
+++ b/deploy/cephfs/kubernetes/csi-provisioner.yaml
@@ -75,7 +75,7 @@ spec:
       serviceAccount: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:latest
+          image: quay.io/k8scsi/csi-provisioner:v0.2.0
           args:
             - "--provisioner=cephfsplugin"
             - "--csi-address=$(ADDRESS)"
diff --git a/pkg/cephfs/cephfs.go b/pkg/cephfs/cephfs.go
index 9c2116c7a..29e3a96d0 100644
--- a/pkg/cephfs/cephfs.go
+++ b/pkg/cephfs/cephfs.go
@@ -41,7 +41,7 @@ type cephfsDriver struct {
 var (
 	driver  *cephfsDriver
 	version = csi.Version{
-		Minor: 1,
+		Minor: 2,
 	}
 )
 
diff --git a/pkg/cephfs/controllerserver.go b/pkg/cephfs/controllerserver.go
index 54ba0e50b..5ada4dfec 100644
--- a/pkg/cephfs/controllerserver.go
+++ b/pkg/cephfs/controllerserver.go
@@ -75,9 +75,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	glog.V(4).Infof("cephfs: volume created at %s", vol.Root)
 
 	return &csi.CreateVolumeResponse{
-		VolumeInfo: &csi.VolumeInfo{
+		Volume: &csi.Volume{
 			Id:            volId.id,
-			CapacityBytes: uint64(volSz),
+			CapacityBytes: volSz,
 			Attributes:    vol.makeMap(),
 		},
 	}, nil