diff --git a/_service b/_service
index 559b39c..28c63ac 100644
--- a/_service
+++ b/_service
@@ -3,13 +3,18 @@
     <param name="url">https://github.com/kubernetes-csi/external-provisioner</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.6.0</param>
-    <param name="revision">321fa5c1c</param>
+    <param name="filename">csi-external-provisioner</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="revision">v1.6.0</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
     <param name="compression">gz</param>
   </service>
+  <service name="set_version" mode="disabled">
+    <param name="basename">csi-external-provisioner</param>
+  </service>
   <service name="go_modules" mode="disabled">
   </service>
 </services>
diff --git a/csi-external-provisioner-1.6.0.tar.gz b/csi-external-provisioner-1.6.0.tar.gz
new file mode 100644
index 0000000..e668894
--- /dev/null
+++ b/csi-external-provisioner-1.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2c5137a127e71b9b13a08c22cb72b271acad7f02cccbae3e9ec38be3b850b57
+size 5398256
diff --git a/csi-external-provisioner.changes b/csi-external-provisioner.changes
index ee5efb3..bd7c2ac 100644
--- a/csi-external-provisioner.changes
+++ b/csi-external-provisioner.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 24 03:08:44 UTC 2020 - Tim Serong <tserong@suse.com>
+
+- Remove duplicate version information from _service file 
+
+-------------------------------------------------------------------
+Wed Nov 18 05:09:15 UTC 2020 - Tim Serong <tserong@suse.com>
+
+- Rework _service and spec file to make future version updates easier
+
 -------------------------------------------------------------------
 Tue Aug 11 01:18:55 UTC 2020 - Chin-Ya Huang <chin-ya.huang@suse.com>
 
diff --git a/csi-external-provisioner.spec b/csi-external-provisioner.spec
index dcfec12..1984c52 100644
--- a/csi-external-provisioner.spec
+++ b/csi-external-provisioner.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package csi-provisioner
+# spec file for package csi-external-provisioner
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %{go_nostrip}
 
 %define project github.com/kubernetes-csi/external-provisioner
@@ -27,19 +28,19 @@ Release:        0
 Summary:        Dynamically provisions volumes of CSI drivers
 License:        Apache-2.0
 Group:          System/Management
-Url:            https://%{project}
-Source:         %{source}-%{version}.tar.gz
+URL:            https://%{project}
+Source:         %{name}-%{version}.tar.gz
 Source1:        vendor.tar.gz
+BuildRequires:  go1.12 >= 1.12.0
 BuildRequires:  golang-packaging
 BuildRequires:  golang(API) >= 1.12
-BuildRequires:  go1.12 >= 1.12.0
 
 %description
 Kubernetes external controller that monitors PersistentVolumeClaim objects created by user and creates/deletes volumes for them.
 
 %prep
-%setup -q -n %{source}-%{version}
-%setup -q -T -D -a 1 -n %{source}-%{version}
+%setup -q
+%setup -q -T -D -a 1
 
 %build
 %goprep %{project}
diff --git a/external-provisioner-1.6.0.tar.gz b/external-provisioner-1.6.0.tar.gz
deleted file mode 100644
index d3aae0d..0000000
--- a/external-provisioner-1.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08b2d2ac983c540a3cf36a06f7da2749e95ae2f5513fae4ffe2939137778a45a
-size 5388919
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 2f1a9f4..d0e4471 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:810328049a08abc98661cd008c0be39d87ee1ddde24719ae5ef0e55a8095a735
-size 5086266
+oid sha256:531ebc7dbe6e025d9946062b6171ef6b19060d0fc7fa699474535934b95880bf
+size 5193079