diff --git a/app/serializers/api/v1/repository_date_range_value_serializer.rb b/app/serializers/api/v1/repository_date_range_value_serializer.rb
index 0aee8064d..7b86c7a62 100644
--- a/app/serializers/api/v1/repository_date_range_value_serializer.rb
+++ b/app/serializers/api/v1/repository_date_range_value_serializer.rb
@@ -3,7 +3,14 @@
 module Api
   module V1
     class RepositoryDateRangeValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :date_range
+      attribute :date_range
+
+      def date_range
+        {
+          from: object.start_time.to_date,
+          to: object.end_time.to_date
+        }
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/repository_date_time_range_value_serializer.rb b/app/serializers/api/v1/repository_date_time_range_value_serializer.rb
index 27549c5f7..e346a70f5 100644
--- a/app/serializers/api/v1/repository_date_time_range_value_serializer.rb
+++ b/app/serializers/api/v1/repository_date_time_range_value_serializer.rb
@@ -3,7 +3,14 @@
 module Api
   module V1
     class RepositoryDateTimeRangeValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :date_time_range
+      attribute :date_time_range
+
+      def date_time_range
+        {
+          from: object.start_time,
+          to: object.end_time
+        }
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/repository_date_time_value_serializer.rb b/app/serializers/api/v1/repository_date_time_value_serializer.rb
index f13f9df9b..be9414cdf 100644
--- a/app/serializers/api/v1/repository_date_time_value_serializer.rb
+++ b/app/serializers/api/v1/repository_date_time_value_serializer.rb
@@ -3,7 +3,11 @@
 module Api
   module V1
     class RepositoryDateTimeValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :date_time
+      attribute :date_time
+
+      def date_time
+        object.data
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/repository_date_value_serializer.rb b/app/serializers/api/v1/repository_date_value_serializer.rb
index 33276f51a..4ec81dd1e 100644
--- a/app/serializers/api/v1/repository_date_value_serializer.rb
+++ b/app/serializers/api/v1/repository_date_value_serializer.rb
@@ -3,7 +3,11 @@
 module Api
   module V1
     class RepositoryDateValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :date
+      attribute :date
+
+      def date
+        object.data.to_date
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/repository_time_range_value_serializer.rb b/app/serializers/api/v1/repository_time_range_value_serializer.rb
index f8155dd43..3be5d79d7 100644
--- a/app/serializers/api/v1/repository_time_range_value_serializer.rb
+++ b/app/serializers/api/v1/repository_time_range_value_serializer.rb
@@ -3,7 +3,14 @@
 module Api
   module V1
     class RepositoryTimeRangeValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :time_range
+      attribute :time_range
+
+      def time_range
+        {
+          from: object.start_time.strftime('%H:%M:%S.%3NZ'),
+          to: object.start_time.strftime('%H:%M:%S.%3NZ')
+        }
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/repository_time_value_serializer.rb b/app/serializers/api/v1/repository_time_value_serializer.rb
index b61e78c7b..a98a3cbed 100644
--- a/app/serializers/api/v1/repository_time_value_serializer.rb
+++ b/app/serializers/api/v1/repository_time_value_serializer.rb
@@ -3,7 +3,11 @@
 module Api
   module V1
     class RepositoryTimeValueSerializer < ActiveModel::Serializer
-      attribute :formatted, key: :time
+      attribute :time
+
+      def time
+        object.data.strftime('%H:%M:%S.%3NZ')
+      end
     end
   end
 end
diff --git a/spec/requests/api/v1/inventory_cells_controller_spec.rb b/spec/requests/api/v1/inventory_cells_controller_spec.rb
index 31043a9ff..89d0cd2ea 100644
--- a/spec/requests/api/v1/inventory_cells_controller_spec.rb
+++ b/spec/requests/api/v1/inventory_cells_controller_spec.rb
@@ -369,10 +369,11 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       ), headers: @valid_headers
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(@valid_item.repository_cells,
-               each_serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(@valid_item.repository_cells, each_serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end
 
@@ -548,10 +549,11 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       expect(response).to have_http_status 201
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(RepositoryCell.last,
-               serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(RepositoryCell.last, serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end
 
@@ -602,10 +604,11 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       expect(response).to have_http_status 201
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(RepositoryCell.last,
-               serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(RepositoryCell.last, serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end
 
@@ -836,10 +839,12 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       expect(response).to have_http_status 200
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(@valid_item.repository_cells.where(repository_column: @date_column).first,
-               serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(@valid_item.repository_cells.where(repository_column: @date_column).first,
+                 serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end
 
@@ -872,10 +877,12 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       expect(response).to have_http_status 200
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(@valid_item.repository_cells.where(repository_column: @date_time_column).first,
-               serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(@valid_item.repository_cells.where(repository_column: @date_time_column).first,
+                 serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end
 
@@ -890,10 +897,12 @@ RSpec.describe 'Api::V1::InventoryCellsController', type: :request do
       expect(response).to have_http_status 200
       expect { hash_body = json }.not_to raise_exception
       expect(hash_body[:data]).to match(
-        ActiveModelSerializers::SerializableResource
-          .new(@valid_item.repository_cells.where(repository_column: @date_range_column).first,
-               serializer: Api::V1::InventoryCellSerializer)
-          .as_json[:data]
+        JSON.parse(
+          ActiveModelSerializers::SerializableResource
+            .new(@valid_item.repository_cells.where(repository_column: @date_range_column).first,
+                 serializer: Api::V1::InventoryCellSerializer)
+            .to_json
+        )['data']
       )
     end