diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
index 658ccc759..cc0839a8d 100644
--- a/.github/workflows/hive.yml
+++ b/.github/workflows/hive.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Run Tests
         run: LOG_IGNORE=1 go test -v -timeout 120s ./...
 
-      # - name: Go Vet
-      #   run: go vet ./...
+      - name: Go Vet
+        run: go vet ./...
 
       - name: Static Check
         uses: dominikh/staticcheck-action@v1
diff --git a/TODO.md b/TODO.md
index 5c3fb2088..caf02d335 100644
--- a/TODO.md
+++ b/TODO.md
@@ -39,6 +39,7 @@ Implementation gaps:
 - [DONE] - import-key-pair
 - [DONE] - describe-images
 - [DONE] - describe-regions
+- [DONE] - describe-volumes
 
 ### To implement
 
@@ -59,7 +60,6 @@ Easier methods to implement
 - describe-tags
 - describe-volume-attribute
 - describe-volume-status
-- describe-volumes
 - detach-network-interface
 - detach-volume
 - get-console-output
diff --git a/go.mod b/go.mod
index efd2d7dec..b6eec0d45 100644
--- a/go.mod
+++ b/go.mod
@@ -64,3 +64,5 @@ require (
 	golang.org/x/time v0.12.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+replace github.com/mulgadc/viperblock => ../viperblock
+replace github.com/mulgadc/predastore => ../predastore
diff --git a/hive/handlers/ec2/instance/service_impl.go b/hive/handlers/ec2/instance/service_impl.go
index 7dab9e1c1..271dea505 100644
--- a/hive/handlers/ec2/instance/service_impl.go
+++ b/hive/handlers/ec2/instance/service_impl.go
@@ -232,7 +232,7 @@ func (s *InstanceServiceImpl) prepareRootVolume(input *ec2.RunInstancesInput, im
 		VolumeConfig: volumeConfig,
 	}
 
-	vb, err := viperblock.New(vbconfig, "s3", cfg)
+	vb, err := viperblock.New(&vbconfig, "s3", cfg)
 	if err != nil {
 		slog.Error("Failed to connect to Viperblock store", "err", err)
 		return errors.New(awserrors.ErrorServerInternal)
@@ -305,7 +305,7 @@ func (s *InstanceServiceImpl) cloneAMIToVolume(input *ec2.RunInstancesInput, siz
 		VolumeConfig: volumeConfig,
 	}
 
-	amiVb, err := viperblock.New(amiVbConfig, "s3", amiCfg)
+	amiVb, err := viperblock.New(&amiVbConfig, "s3", amiCfg)
 	if err != nil {
 		slog.Error("Failed to connect to Viperblock store for AMI", "err", err)
 		return errors.New(awserrors.ErrorServerInternal)
@@ -410,7 +410,7 @@ func (s *InstanceServiceImpl) prepareEFIVolume(imageId string, volumeConfig vipe
 		VolumeConfig: volumeConfig,
 	}
 
-	efiVb, err := viperblock.New(efiVbConfig, "s3", efiCfg)
+	efiVb, err := viperblock.New(&efiVbConfig, "s3", efiCfg)
 	if err != nil {
 		slog.Error("Could not create EFI viperblock", "err", err)
 		return errors.New(awserrors.ErrorServerInternal)
@@ -501,7 +501,7 @@ func (s *InstanceServiceImpl) prepareCloudInitVolume(input *ec2.RunInstancesInpu
 		VolumeConfig: volumeConfig,
 	}
 
-	cloudInitVb, err := viperblock.New(cloudInitVbConfig, "s3", cloudInitCfg)
+	cloudInitVb, err := viperblock.New(&cloudInitVbConfig, "s3", cloudInitCfg)
 	if err != nil {
 		slog.Error("Could not create cloudinit viperblock", "err", err)
 		return errors.New(awserrors.ErrorServerInternal)
diff --git a/hive/services/viperblockd/viperblockd.go b/hive/services/viperblockd/viperblockd.go
index 94e327c66..447250e9e 100644
--- a/hive/services/viperblockd/viperblockd.go
+++ b/hive/services/viperblockd/viperblockd.go
@@ -208,7 +208,7 @@ func launchService(cfg *Config) (err error) {
 			VolumeConfig: viperblock.VolumeConfig{},
 		}
 
-		vb, err := viperblock.New(vbconfig, "s3", s3cfg)
+		vb, err := viperblock.New(&vbconfig, "s3", s3cfg)
 
 		// TODO: Improve
 		// 5% of system memory for cache for master volumes