diff --git a/cmd/init.go b/cmd/init.go
index 974965802..bfbf8118f 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -62,31 +62,37 @@ var initCmd = &cobra.Command{
 		}
 
 		// etcd binaries installation
-		inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
-		if err != nil {
-			log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
-		}
-		if !inCache {
-			log.Printf("[install] Artifact not found in cache. Trying to fetch from upstream: %s", etcdAdmConfig.ReleaseURL)
-			if err = binary.Download(etcdAdmConfig.ReleaseURL, etcdAdmConfig.Version, etcdAdmConfig.CacheDir); err != nil {
-				log.Fatalf("[install] Unable to fetch artifact from upstream: %s", err)
-			}
-			// Try installing binaries from cache now
-			inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
-			if err != nil {
-				log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
-			}
-			if !inCache {
-				log.Fatalf("[install] Artifact not found in cache after download. Exiting.")
-			}
-		}
-		installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
-		if err != nil {
-			log.Fatalf("[install] Error: %s", err)
-		}
-		if !installed {
-			log.Fatalf("[install] Binaries not found in install dir. Exiting.")
-		}
+                installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
+                if err != nil {
+                        log.Fatalf("[install] Error: %s", err)
+                }
+                if !installed {
+                        inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
+                        if err != nil {
+                                log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
+                        }
+                        if !inCache {
+                                log.Printf("[install] Artifact not found in cache. Trying to fetch from upstream: %s", etcdAdmConfig.ReleaseURL)
+                                if err = binary.Download(etcdAdmConfig.ReleaseURL, etcdAdmConfig.Version, etcdAdmConfig.CacheDir); err != nil {
+                                        log.Fatalf("[install] Unable to fetch artifact from upstream: %s", err)
+                                }
+                                // Try installing binaries from cache now
+                                inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
+                                if err != nil {
+                                        log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
+                                }
+                                if !inCache {
+                                        log.Fatalf("[install] Artifact not found in cache after download. Exiting.")
+                                }
+                        }
+                        installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
+                        if err != nil {
+                                log.Fatalf("[install] Error: %s", err)
+                        }
+                        if !installed {
+                                log.Fatalf("[install] Binaries not found in install dir. Exiting.")
+                        }
+                }
 		// cert management
 		if err = certs.CreatePKIAssets(&etcdAdmConfig); err != nil {
 			log.Fatalf("[certificates] Error: %s", err)
diff --git a/cmd/join.go b/cmd/join.go
index b2ad24c77..05ed29b20 100644
--- a/cmd/join.go
+++ b/cmd/join.go
@@ -149,31 +149,37 @@ var joinCmd = &cobra.Command{
 		}
 
 		// etcd binaries installation
-		inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
-		if err != nil {
-			log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
-		}
-		if !inCache {
-			log.Printf("[install] Artifact not found in cache. Trying to fetch from upstream: %s", etcdAdmConfig.ReleaseURL)
-			if err = binary.Download(etcdAdmConfig.ReleaseURL, etcdAdmConfig.Version, etcdAdmConfig.CacheDir); err != nil {
-				log.Fatalf("[install] Unable to fetch artifact from upstream: %s", err)
-			}
-			// Try installing binaries from cache now
-			inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
-			if err != nil {
-				log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
-			}
-			if !inCache {
-				log.Fatalf("[install] Artifact not found in cache after download. Exiting.")
-			}
-		}
-		installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
-		if err != nil {
-			log.Fatalf("[install] Error: %s", err)
-		}
-		if !installed {
-			log.Fatalf("[install] Binaries not found in install dir. Exiting.")
-		}
+                installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
+                if err != nil {
+                        log.Fatalf("[install] Error: %s", err)
+                }
+                if !installed {
+                        inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
+                        if err != nil {
+                                log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
+                        }
+                        if !inCache {
+                                log.Printf("[install] Artifact not found in cache. Trying to fetch from upstream: %s", etcdAdmConfig.ReleaseURL)
+                                if err = binary.Download(etcdAdmConfig.ReleaseURL, etcdAdmConfig.Version, etcdAdmConfig.CacheDir); err != nil {
+                                        log.Fatalf("[install] Unable to fetch artifact from upstream: %s", err)
+                                }
+                                // Try installing binaries from cache now
+                                inCache, err := binary.InstallFromCache(etcdAdmConfig.Version, etcdAdmConfig.InstallDir, etcdAdmConfig.CacheDir)
+                                if err != nil {
+                                        log.Fatalf("[install] Artifact could not be installed from cache: %s", err)
+                                }
+                                if !inCache {
+                                        log.Fatalf("[install] Artifact not found in cache after download. Exiting.")
+                                }
+                        }
+                        installed, err := binary.IsInstalled(etcdAdmConfig.Version, etcdAdmConfig.InstallDir)
+                        if err != nil {
+                                log.Fatalf("[install] Error: %s", err)
+                        }
+                        if !installed {
+                                log.Fatalf("[install] Binaries not found in install dir. Exiting.")
+                        }
+                }
 
 		if err := service.WriteEnvironmentFile(&etcdAdmConfig); err != nil {
 			log.Fatalf("[configure] Error: %s", err)