diff --git a/include/ygm/container/detail/map_impl.hpp b/include/ygm/container/detail/map_impl.hpp
index 4755ba6b..0d5b4213 100644
--- a/include/ygm/container/detail/map_impl.hpp
+++ b/include/ygm/container/detail/map_impl.hpp
@@ -326,10 +326,14 @@ class map_impl {
       for (std::pair<const key_type, value_type> &kv : m_local_map) {
         fn(kv.first, kv.second);
       }
+    } else if constexpr (std::is_invocable<decltype(fn), value_type &>()) {
+      for (std::pair<const key_type, value_type> &kv : m_local_map) {
+        fn(kv.second);
+      }
     } else {
       static_assert(ygm::detail::always_false<>,
                     "local map lambda signature must be invocable with (const "
-                    "&key_type, value_type&) signature");
+                    "key_type &, value_type &) or (value_type &) signatures");
     }
   }
 
diff --git a/test/test_map.cpp b/test/test_map.cpp
index 00ff58e8..49684189 100644
--- a/test/test_map.cpp
+++ b/test/test_map.cpp
@@ -224,7 +224,7 @@ int main(int argc, char **argv) {
   }
 
   //
-  // Test for_all
+  // Test for_all (key-value)
   {
     ygm::container::map<std::string, std::string> smap1(world);
     ygm::container::map<std::string, std::string> smap2(world);
@@ -242,5 +242,28 @@ int main(int argc, char **argv) {
     ASSERT_RELEASE(smap2.count("red") == 1);
   }
 
+  //
+  // Test for_all (value)
+  {
+    ygm::container::map<std::string, std::string> smap1(world);
+    ygm::container::map<std::string, std::string> smap2(world);
+
+    smap1.async_insert("dog", "cat");
+    smap1.async_insert("apple", "orange");
+    smap1.async_insert("red", "green");
+
+    smap1.for_all(
+        [&smap2](const auto &value) { smap2.async_insert(value, value); });
+
+    smap1.comm().barrier();
+
+    ASSERT_RELEASE(smap2.count("cat") == 1);
+    ASSERT_RELEASE(smap2.count("orange") == 1);
+    ASSERT_RELEASE(smap2.count("green") == 1);
+    ASSERT_RELEASE(smap2.count("dog") == 0);
+    ASSERT_RELEASE(smap2.count("apple") == 0);
+    ASSERT_RELEASE(smap2.count("red") == 0);
+  }
+
   return 0;
 }