diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp
index f097ac6..926cfd5 100644
--- a/redfish-core/include/redfish_aggregator.hpp
+++ b/redfish-core/include/redfish_aggregator.hpp
@@ -51,19 +51,14 @@
                               propertyName);
 }
 
-static void addPrefixToItem(nlohmann::json& item, std::string_view prefix)
+static inline void addPrefixToStringItem(std::string& strValue,
+                                         std::string_view prefix)
 {
-    std::string* strValue = item.get_ptr<std::string*>();
-    if (strValue == nullptr)
-    {
-        BMCWEB_LOG_CRITICAL << "Field wasn't a string????";
-        return;
-    }
     // Make sure the value is a properly formatted URI
-    auto parsed = boost::urls::parse_relative_ref(*strValue);
+    auto parsed = boost::urls::parse_relative_ref(strValue);
     if (!parsed)
     {
-        BMCWEB_LOG_CRITICAL << "Couldn't parse URI from resource " << *strValue;
+        BMCWEB_LOG_CRITICAL << "Couldn't parse URI from resource " << strValue;
         return;
     }
 
@@ -132,13 +127,55 @@
     if (addedPrefix)
     {
         url.segments().insert(url.segments().begin(), {"redfish", "v1"});
-        item = url;
+        strValue = url.buffer();
     }
 }
 
+static inline void addPrefixToItem(nlohmann::json& item,
+                                   std::string_view prefix)
+{
+    std::string* strValue = item.get_ptr<std::string*>();
+    if (strValue == nullptr)
+    {
+        BMCWEB_LOG_CRITICAL << "Field wasn't a string????";
+        return;
+    }
+    addPrefixToStringItem(*strValue, prefix);
+    item = *strValue;
+}
+
+static inline void addAggregatedHeaders(crow::Response& asyncResp,
+                                        crow::Response& resp,
+                                        std::string_view prefix)
+{
+    if (!resp.getHeaderValue("Content-Type").empty())
+    {
+        asyncResp.addHeader(boost::beast::http::field::content_type,
+                            resp.getHeaderValue("Content-Type"));
+    }
+    if (!resp.getHeaderValue("Allow").empty())
+    {
+        asyncResp.addHeader(boost::beast::http::field::allow,
+                            resp.getHeaderValue("Allow"));
+    }
+    std::string_view header = resp.getHeaderValue("Location");
+    if (!header.empty())
+    {
+        std::string location(header);
+        addPrefixToStringItem(location, prefix);
+        asyncResp.addHeader(boost::beast::http::field::location, location);
+    }
+    if (!resp.getHeaderValue("Retry-After").empty())
+    {
+        asyncResp.addHeader(boost::beast::http::field::retry_after,
+                            resp.getHeaderValue("Retry-After"));
+    }
+    // TODO: we need special handling for Link Header Value
+}
+
 // Search the json for all URIs and add the supplied prefix if the URI is for
 // an aggregated resource.
-static void addPrefixes(nlohmann::json& json, std::string_view prefix)
+static inline void addPrefixes(nlohmann::json& json, std::string_view prefix)
 {
     nlohmann::json::object_t* object =
         json.get_ptr<nlohmann::json::object_t*>();
@@ -637,15 +674,11 @@
         }
         else
         {
-            if (!resp.body().empty())
-            {
-                // We received a valid response without the correct
-                // Content-Type so return an Operation Failed error
-                BMCWEB_LOG_ERROR
-                    << "Satellite response must be of type \"application/json\"";
-                messages::operationFailed(asyncResp->res);
-            }
+            // We allow any Content-Type that is not "application/json" now
+            asyncResp->res.result(resp.result());
+            asyncResp->res.write(resp.body());
         }
+        addAggregatedHeaders(asyncResp->res, resp, prefix);
     }
 
     // Processes the collection response returned by a satellite BMC and merges
diff --git a/test/redfish-core/include/redfish_aggregator_test.cpp b/test/redfish-core/include/redfish_aggregator_test.cpp
index 5a7d2d0..345854f 100644
--- a/test/redfish-core/include/redfish_aggregator_test.cpp
+++ b/test/redfish-core/include/redfish_aggregator_test.cpp
@@ -217,11 +217,23 @@
     resp.body() =
         jsonResp.dump(2, ' ', true, nlohmann::json::error_handler_t::replace);
     resp.addHeader("Content-Type", "application/json");
+    resp.addHeader("Allow", "GET");
+    resp.addHeader("Location", "/redfish/v1/Chassis/TestChassis");
+    resp.addHeader("Link", "</redfish/v1/Test.json>; rel=describedby");
+    resp.addHeader("Retry-After", "120");
     resp.result(result);
 
     auto asyncResp = std::make_shared<bmcweb::AsyncResp>();
     RedfishAggregator::processResponse("prefix", asyncResp, resp);
 
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Content-Type"),
+              "application/json");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Allow"), "GET");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Location"),
+              "/redfish/v1/Chassis/prefix_TestChassis");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Link"), "");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Retry-After"), "120");
+
     EXPECT_EQ(asyncResp->res.jsonValue["Name"], "Test");
     EXPECT_EQ(asyncResp->res.jsonValue["@odata.id"],
               "/redfish/v1/Chassis/prefix_TestChassis");
@@ -445,6 +457,32 @@
     EXPECT_EQ(asyncResp->res.getHeaderValue("OData-Version"), "4.0");
     EXPECT_EQ(asyncResp->res.getHeaderValue("Location"), "");
 }
+void assertProcessResponseContentType(std::string_view contentType)
+{
+    crow::Response resp;
+    resp.body() = "responseBody";
+    resp.addHeader("Content-Type", contentType);
+    resp.addHeader("Location", "/redfish/v1/Chassis/TestChassis");
+    resp.addHeader("Link", "metadataLink");
+    resp.addHeader("Retry-After", "120");
+
+    auto asyncResp = std::make_shared<bmcweb::AsyncResp>();
+    RedfishAggregator::processResponse("prefix", asyncResp, resp);
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Content-Type"), contentType);
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Location"),
+              "/redfish/v1/Chassis/prefix_TestChassis");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Link"), "");
+    EXPECT_EQ(asyncResp->res.getHeaderValue("Retry-After"), "120");
+    EXPECT_EQ(asyncResp->res.body(), "responseBody");
+}
+
+TEST(processResponse, DifferentContentType)
+{
+    assertProcessResponseContentType("application/xml");
+    assertProcessResponseContentType("application/yaml");
+    assertProcessResponseContentType("text/event-stream");
+    assertProcessResponseContentType(";charset=utf-8");
+}
 
 } // namespace
 } // namespace redfish