diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 8c6962b57f..ae20f656f9 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -496,6 +496,9 @@ fi
 # Disable SSHD if requested
 if [ "$AMP_DISABLE_SSHD" -eq 1 ]; then
     AMP_element_sequence="$AMP_element_sequence remove-sshd"
+    export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-False}
+else
+    export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-True}
 fi
 
 # Enable FIPS if requested
diff --git a/elements/amphora-agent/package-installs.yaml b/elements/amphora-agent/package-installs.yaml
index c5fe07fc3d..621ddfbcf0 100644
--- a/elements/amphora-agent/package-installs.yaml
+++ b/elements/amphora-agent/package-installs.yaml
@@ -74,6 +74,7 @@ open-vm-tools:
   arch: amd64
 openssh-client:
 openssh-server:
+  when: DIB_OCTAVIA_AMP_USE_SSH = True
 pollinate:
 ppc64-diag:
   arch: ppc64le, ppc64el
diff --git a/releasenotes/notes/Fix-disable-sshd-470ba6a09278df69.yaml b/releasenotes/notes/Fix-disable-sshd-470ba6a09278df69.yaml
new file mode 100644
index 0000000000..693f8c6884
--- /dev/null
+++ b/releasenotes/notes/Fix-disable-sshd-470ba6a09278df69.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed a bug that caused SSH to not be diabled in amphora images created
+    with the "-n" flag.