diff --git a/goss/goss-kernel-params.yaml b/goss/goss-kernel-params.yaml
index dc6db27..adff50e 100644
--- a/goss/goss-kernel-params.yaml
+++ b/goss/goss-kernel-params.yaml
@@ -6,15 +6,12 @@ kernel-param:
     value: "1"
   net.bridge.bridge-nf-call-ip6tables:
     value: "1"
-{{if eq .Vars.OS "photon-3"}}
+{{if and (contains "1.24" .Vars.kubernetes_version ) (contains "photon" .Vars.OS )}}
   net.ipv4.ip_forward:
     value: "0"
   net.ipv6.conf.all.forwarding:
     value: "0"
-  net.ipv4.tcp_congestion_control:
-    value: "cubic"
-{{end}}
-{{if eq .Vars.OS "ubuntu-2004-efi"}}
+{{else}}
   net.ipv4.ip_forward:
     value: "1"
   net.ipv6.conf.all.forwarding:
diff --git a/goss/goss-vars.yaml b/goss/goss-vars.yaml
index e6df408..eebc864 100644
--- a/goss/goss-vars.yaml
+++ b/goss/goss-vars.yaml
@@ -134,7 +134,8 @@ tkg:
       iproute2:
       util-linux:
       kmod:
-      linux-esx:
+      linux:
+      linux-devel:
       iptables:
       Linux-PAM:
       systemd:
diff --git a/packer-variables/default-args.j2 b/packer-variables/default-args.j2
index 9a083e1..4803a1f 100644
--- a/packer-variables/default-args.j2
+++ b/packer-variables/default-args.j2
@@ -47,7 +47,7 @@
     {# Update the required packer based on the OS consumption #}
     {% if os_type == "photon-3" %}
     "distro_version": "3.0",
-    "extra_rpms": "glibc zlib filesystem ethtool pkg-config bash bzip2 shadow procps-ng iana-etc coreutils bc libtool findutils xz iproute2 util-linux kmod linux-esx iptables Linux-PAM systemd dbus file e2fsprogs rpm gawk cloud-utils gptfdisk nfs-utils openssh gdbm photon-release photon-repos haveged sed grep cpio gzip vim libdb tdnf less iputils bindutils diffutils bridge-utils cri-tools apparmor-utils apparmor-profiles krb5 which tzdata motd sudo iotop lsof traceroute ethtool dstat ltrace ipset netcat tcpdump wget"
+    "extra_rpms": "glibc zlib filesystem ethtool pkg-config bash bzip2 shadow procps-ng iana-etc coreutils bc libtool findutils xz iproute2 util-linux kmod linux linux-devel iptables Linux-PAM systemd dbus file e2fsprogs rpm gawk cloud-utils gptfdisk nfs-utils openssh gdbm photon-release photon-repos haveged sed grep cpio gzip vim libdb tdnf less iputils bindutils diffutils bridge-utils cri-tools apparmor-utils apparmor-profiles krb5 which tzdata motd sudo iotop lsof traceroute ethtool dstat ltrace ipset netcat tcpdump wget net-tools curl tar open-vm-tools libseccomp cloud-init sysstat jq conntrack"
     {% elif os_type == "ubuntu-2004-efi" %}
     "extra_debs": "unzip iptables-persistent nfs-common",
     "boot_disable_ipv6": "1"