diff --git a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h
index 735dfbe694f..d5e37908be5 100644
--- a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h
+++ b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h
@@ -100,6 +100,9 @@ class ITK_TEMPLATE_EXPORT GradientImageFilter : public ImageToImageFilter<TInput
   using CovariantVectorType = CovariantVector<OutputValueType, Self::OutputImageDimension>;
   using OutputImageRegionType = typename OutputImageType::RegionType;
 
+  /** Helper typedef for the parameter type of OverrideBoundaryCondition. */
+  using BoundaryConditionType = ImageBoundaryCondition<TInputImage>;
+
   /** GradientImageFilter needs a larger input requested region than
    * the output requested region.  As such, GradientImageFilter needs
    * to provide an implementation for GenerateInputRequestedRegion()
@@ -138,9 +141,16 @@ class ITK_TEMPLATE_EXPORT GradientImageFilter : public ImageToImageFilter<TInput
   }
 #endif
 
+#ifndef ITK_FUTURE_LEGACY_REMOVE
+  /** Allows to change the default boundary condition
+   * \note This filter takes ownership of the specified boundary condition object. */
+  [[deprecated("Deprecated in favor of `OverrideBoundaryCondition(std::unique_ptr<BoundaryConditionType>)`.")]] void
+  OverrideBoundaryCondition(BoundaryConditionType * boundaryCondition);
+#endif
+
   /** Allows to change the default boundary condition */
   void
-  OverrideBoundaryCondition(ImageBoundaryCondition<TInputImage> * boundaryCondition);
+  OverrideBoundaryCondition(std::unique_ptr<BoundaryConditionType> && boundaryCondition);
 
 #ifdef ITK_USE_CONCEPT_CHECKING
   // Begin concept checking
@@ -227,8 +237,8 @@ class ITK_TEMPLATE_EXPORT GradientImageFilter : public ImageToImageFilter<TInput
   // when computing the derivatives.
   bool m_UseImageDirection{ true };
 
-  // allow setting the the m_BoundaryCondition
-  std::unique_ptr<ImageBoundaryCondition<TInputImage, TInputImage>> m_BoundaryCondition{
+  // allow setting the m_BoundaryCondition
+  std::unique_ptr<BoundaryConditionType> m_BoundaryCondition{
     std::make_unique<ZeroFluxNeumannBoundaryCondition<TInputImage>>()
   };
 };
diff --git a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.hxx b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.hxx
index 1d24ceea924..1aa68b0ebc4 100644
--- a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.hxx
+++ b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.hxx
@@ -37,13 +37,23 @@ GradientImageFilter<TInputImage, TOperatorValueType, TOutputValueType, TOutputIm
   this->ThreaderUpdateProgressOff();
 }
 
+#ifndef ITK_FUTURE_LEGACY_REMOVE
 template <typename TInputImage, typename TOperatorValueType, typename TOutputValue, typename TOutputImage>
 void
 GradientImageFilter<TInputImage, TOperatorValueType, TOutputValue, TOutputImage>::OverrideBoundaryCondition(
-  ImageBoundaryCondition<TInputImage> * boundaryCondition)
+  BoundaryConditionType * boundaryCondition)
 {
   m_BoundaryCondition.reset(boundaryCondition);
 }
+#endif
+
+template <typename TInputImage, typename TOperatorValueType, typename TOutputValue, typename TOutputImage>
+void
+GradientImageFilter<TInputImage, TOperatorValueType, TOutputValue, TOutputImage>::OverrideBoundaryCondition(
+  std::unique_ptr<BoundaryConditionType> && boundaryCondition)
+{
+  m_BoundaryCondition = std::move(boundaryCondition);
+}
 
 template <typename TInputImage, typename TOperatorValueType, typename TOutputValueType, typename TOutputImageType>
 void
diff --git a/Modules/Filtering/ImageGradient/test/itkGradientImageFilterTest.cxx b/Modules/Filtering/ImageGradient/test/itkGradientImageFilterTest.cxx
index 9020375b366..2b8f5f4f6f5 100644
--- a/Modules/Filtering/ImageGradient/test/itkGradientImageFilterTest.cxx
+++ b/Modules/Filtering/ImageGradient/test/itkGradientImageFilterTest.cxx
@@ -89,7 +89,7 @@ itkGradientImageFilterTest(int argc, char * argv[])
 
   using PeriodicBoundaryType = itk::PeriodicBoundaryCondition<InputImageType2>;
   // Test the OverrideBoundaryCondition setting;
-  filter2->OverrideBoundaryCondition(new PeriodicBoundaryType);
+  filter2->OverrideBoundaryCondition(std::make_unique<PeriodicBoundaryType>());
 
   ITK_EXERCISE_BASIC_OBJECT_METHODS(filter2, GradientImageFilter, ImageToImageFilter);