diff --git a/aws.scm b/aws.scm
index e6594dd..3bf97ee 100644
--- a/aws.scm
+++ b/aws.scm
@@ -5,9 +5,9 @@
              (metznet aws)
              (gnu services shepherd)
              (gnu services networking)
+             (gnu packages vim)
+             (gnu packages version-control)
              (gnu services ssh)
-             (gnu packages ssh)
-             (gnu packages python-web)
              (gnu packages shells))
 
 (operating-system
@@ -37,7 +37,7 @@
                                                "%aws ALL=(ALL:ALL) ALL" "")
                                          "\n")))
 
-  (packages (cons* openssh awscli %base-packages))
+  (packages (cons* neovim git %base-packages))
 
   (services
    (cons* (service dhcp-client-service-type)