diff --git a/libpfr/inc/pfr.hpp b/libpfr/inc/pfr.hpp
index c0d3c11..e327b69 100644
--- a/libpfr/inc/pfr.hpp
+++ b/libpfr/inc/pfr.hpp
@@ -27,7 +27,9 @@
     biosActive,
     biosRecovery,
     bmcActive,
-    bmcRecovery
+    bmcRecovery,
+    afmActive,
+    afmRecovery
 };
 
 enum class ActionType
diff --git a/libpfr/src/pfr.cpp b/libpfr/src/pfr.cpp
index 64476f4..856a39c 100644
--- a/libpfr/src/pfr.cpp
+++ b/libpfr/src/pfr.cpp
@@ -53,6 +53,10 @@
 static constexpr uint8_t pchRecoveryMinorVersion = 0x1C;
 static constexpr uint8_t CPLDHashRegStart = 0x20;
 static constexpr uint8_t pfrRoTValue = 0xDE;
+static constexpr uint8_t afmActiveMajorVersion = 0x75;
+static constexpr uint8_t afmActiveMinorVersion = 0x76;
+static constexpr uint8_t afmRecoveryMajorVersion = 0x78;
+static constexpr uint8_t afmRecoveryMinorVersion = 0x79;
 
 static constexpr uint8_t ufmLockedMask = (0x1 << 0x04);
 static constexpr uint8_t ufmProvisionedMask = (0x1 << 0x05);
@@ -366,6 +370,16 @@
         {
             return readBMCVersionFromSPI(imgType);
         }
+        case (ImageType::afmActive):
+        {
+            return readVersionFromCPLD(afmActiveMajorVersion,
+                                       afmActiveMinorVersion);
+        }
+        case (ImageType::afmRecovery):
+        {
+            return readVersionFromCPLD(afmRecoveryMajorVersion,
+                                       afmRecoveryMinorVersion);
+        }
         default:
             // Invalid image Type.
             return "";