diff --git a/nodeup/pkg/model/hooks.go b/nodeup/pkg/model/hooks.go
index 3fdbb5ed48..74eb888128 100644
--- a/nodeup/pkg/model/hooks.go
+++ b/nodeup/pkg/model/hooks.go
@@ -53,12 +53,12 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
 			var name string
 			switch hook.Name {
 			case "":
-				name = fmt.Sprintf("kops-hook-%d.service", j)
+				name = fmt.Sprintf("kops-hook-%d", j)
 				if isInstanceGroup {
-					name = fmt.Sprintf("%s-ig.service", name)
+					name += "-ig"
 				}
 			default:
-				name = fmt.Sprintf("%s.service", hook.Name)
+				name = hook.Name
 			}
 
 			if _, found := hookNames[name]; found {
@@ -72,7 +72,7 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
 				enabled := false
 				managed := true
 				c.AddTask(&nodetasks.Service{
-					Name:        hook.Name,
+					Name:        ensureSystemdSuffix(name),
 					ManageState: &managed,
 					Enabled:     &enabled,
 					Running:     &enabled,
@@ -94,6 +94,14 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
 	return nil
 }
 
+// ensureSystemdSuffix makes sure that we have a .service suffix on the name, needed on needed versions of systems
+func ensureSystemdSuffix(name string) string {
+	if !strings.HasSuffix(name, ".service") && !strings.HasSuffix(name, ".timer") {
+		name += ".service"
+	}
+	return name
+}
+
 // buildSystemdService is responsible for generating the service
 func (h *HookBuilder) buildSystemdService(name string, hook *kops.HookSpec) (*nodetasks.Service, error) {
 	// perform some basic validation
@@ -130,7 +138,7 @@ func (h *HookBuilder) buildSystemdService(name string, hook *kops.HookSpec) (*no
 	}
 
 	service := &nodetasks.Service{
-		Name:       name,
+		Name:       ensureSystemdSuffix(name),
 		Definition: s(unit.Render()),
 	}