diff --git a/_service b/_service
index c5e0a23..119aa3d 100644
--- a/_service
+++ b/_service
@@ -3,13 +3,16 @@
     <param name="url">https://github.com/kubernetes-csi/external-snapshotter</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
+    <param name="filename">csi-external-snapshotter</param>
     <param name="versionformat">2.1.1</param>
-    <param name="revision">034c5458</param>
+    <param name="revision">v2.1.1</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
     <param name="compression">gz</param>
   </service>
+  <service name="set_version" mode="disabled">
+  </service>
   <service name="go_modules" mode="disabled">
   </service>
 </services>
diff --git a/csi-external-snapshotter-2.1.1.tar.gz b/csi-external-snapshotter-2.1.1.tar.gz
new file mode 100644
index 0000000..60e74ad
--- /dev/null
+++ b/csi-external-snapshotter-2.1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:788e9431e56d92a057288b07747ab506da28e2c490859fe19cf462c494881ca7
+size 5894098
diff --git a/csi-external-snapshotter.changes b/csi-external-snapshotter.changes
index 52a5591..7595a2a 100644
--- a/csi-external-snapshotter.changes
+++ b/csi-external-snapshotter.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 18 05:09:25 UTC 2020 - Tim Serong <tserong@suse.com>
+
+- Rework _service and spec file to make future version updates easier
+
 -------------------------------------------------------------------
 Tue Aug 25 06:21:43 UTC 2020 - Tim Serong <tserong@suse.com>
 
diff --git a/csi-external-snapshotter.spec b/csi-external-snapshotter.spec
index ed5062e..c060c46 100644
--- a/csi-external-snapshotter.spec
+++ b/csi-external-snapshotter.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package csi-snapshotter
+# spec file for package csi-external-snapshotter
 #
-# 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-snapshotter/v2
@@ -27,8 +28,8 @@ Release:        0
 Summary:        Triggers CreateSnapshot/DeleteSnapshot against a CSI endpoint
 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:  golang-packaging
 BuildRequires:  golang(API) >= 1.12
@@ -37,8 +38,8 @@ BuildRequires:  golang(API) >= 1.12
 Kubernetes CSI external-snapshotter sidecar watches Kubernetes VolumeSnapshotContent CRD objects and triggers CreateSnapshot/DeleteSnapshot against a CSI endpoint.
 
 %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}
@@ -56,4 +57,3 @@ export CGO_ENABLED=0
 %{_bindir}/%{package}
 
 %changelog
-
diff --git a/external-snapshotter-2.1.1.tar.gz b/external-snapshotter-2.1.1.tar.gz
deleted file mode 100644
index 67eeca5..0000000
--- a/external-snapshotter-2.1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd650d0186aa9007ade1ecfb0c3d7de9c6ec4643cea0cab16d672fb45067968d
-size 5884571
diff --git a/vendor.tar.gz b/vendor.tar.gz
index d787905..b0697be 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae1756deb308422ec5fad761116ab93265988a244848bb4469d0f02e8b63db3c
-size 5525448
+oid sha256:747cbb1b3deecc2003c71fae1a5b6e06122c429c56abce4b74e37d46423736aa
+size 5651004