diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 47c08197b6..c014374306 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -1350,8 +1350,8 @@ gst_vaapidecode_class_init (GstVaapiDecodeClass * klass)
   gst_element_class_add_pad_template (element_class, pad_template);
 
   /* src pad */
-  pad_template = gst_static_pad_template_get (&gst_vaapidecode_src_factory);
-  gst_element_class_add_pad_template (element_class, pad_template);
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapidecode_src_factory);
 }
 
 static void
diff --git a/gst/vaapi/gstvaapidecodebin.c b/gst/vaapi/gstvaapidecodebin.c
index 1b1aead9cb..0e3b713c26 100644
--- a/gst/vaapi/gstvaapidecodebin.c
+++ b/gst/vaapi/gstvaapidecodebin.c
@@ -264,11 +264,11 @@ gst_vaapi_decode_bin_class_init (GstVaapiDecodeBinClass * klass)
 
   g_object_class_install_properties (gobject_class, PROP_LAST, properties);
 
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapi_decode_bin_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapi_decode_bin_sink_factory);
 
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapi_decode_bin_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapi_decode_bin_src_factory);
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_vaapi_decode_bin,
       GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c
index ba7a1e5287..d07f4ffecc 100644
--- a/gst/vaapi/gstvaapiencode_h264.c
+++ b/gst/vaapi/gstvaapiencode_h264.c
@@ -405,12 +405,12 @@ gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass)
       GST_PLUGIN_DESC, "Wind Yuan <feng.yuan@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_h264_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_h264_sink_factory);
 
   /* src pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_h264_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_h264_src_factory);
 
   gst_vaapiencode_class_init_properties (encode_class);
 }
diff --git a/gst/vaapi/gstvaapiencode_h265.c b/gst/vaapi/gstvaapiencode_h265.c
index f48adbf400..49115754fe 100644
--- a/gst/vaapi/gstvaapiencode_h265.c
+++ b/gst/vaapi/gstvaapiencode_h265.c
@@ -405,12 +405,12 @@ gst_vaapiencode_h265_class_init (GstVaapiEncodeH265Class * klass)
       "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_h265_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_h265_sink_factory);
 
   /* src pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_h265_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_h265_src_factory);
 
   gst_vaapiencode_class_init_properties (encode_class);
 }
diff --git a/gst/vaapi/gstvaapiencode_jpeg.c b/gst/vaapi/gstvaapiencode_jpeg.c
index 58c057ae01..4e6bbcf668 100644
--- a/gst/vaapi/gstvaapiencode_jpeg.c
+++ b/gst/vaapi/gstvaapiencode_jpeg.c
@@ -166,12 +166,12 @@ gst_vaapiencode_jpeg_class_init (GstVaapiEncodeJpegClass * klass)
       "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_jpeg_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_jpeg_sink_factory);
 
   /* src pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_jpeg_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_jpeg_src_factory);
 
   gst_vaapiencode_class_init_properties (encode_class);
 }
diff --git a/gst/vaapi/gstvaapiencode_mpeg2.c b/gst/vaapi/gstvaapiencode_mpeg2.c
index c060061fa0..4864c90fa7 100644
--- a/gst/vaapi/gstvaapiencode_mpeg2.c
+++ b/gst/vaapi/gstvaapiencode_mpeg2.c
@@ -169,12 +169,12 @@ gst_vaapiencode_mpeg2_class_init (GstVaapiEncodeMpeg2Class * klass)
       GST_PLUGIN_DESC, "Guangxin Xu <guangxin.xu@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_mpeg2_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_mpeg2_sink_factory);
 
   /* src pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_mpeg2_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_mpeg2_src_factory);
 
   gst_vaapiencode_class_init_properties (encode_class);
 }
diff --git a/gst/vaapi/gstvaapiencode_vp8.c b/gst/vaapi/gstvaapiencode_vp8.c
index cc9beb36a9..54e63b4b21 100644
--- a/gst/vaapi/gstvaapiencode_vp8.c
+++ b/gst/vaapi/gstvaapiencode_vp8.c
@@ -166,12 +166,12 @@ gst_vaapiencode_vp8_class_init (GstVaapiEncodeVP8Class * klass)
       "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_vp8_sink_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_vp8_sink_factory);
 
   /* src pad */
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_vaapiencode_vp8_src_factory));
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapiencode_vp8_src_factory);
 
   gst_vaapiencode_class_init_properties (encode_class);
 }
diff --git a/gst/vaapi/gstvaapipostproc.c b/gst/vaapi/gstvaapipostproc.c
index 15c7275e50..41f36fd6ae 100644
--- a/gst/vaapi/gstvaapipostproc.c
+++ b/gst/vaapi/gstvaapipostproc.c
@@ -1527,7 +1527,6 @@ gst_vaapipostproc_class_init (GstVaapiPostprocClass * klass)
   GObjectClass *const object_class = G_OBJECT_CLASS (klass);
   GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
   GstBaseTransformClass *const trans_class = GST_BASE_TRANSFORM_CLASS (klass);
-  GstPadTemplate *pad_template;
   GPtrArray *filter_ops;
   GstVaapiFilterOpInfo *filter_op;
 
@@ -1560,12 +1559,12 @@ gst_vaapipostproc_class_init (GstVaapiPostprocClass * klass)
       GST_PLUGIN_DESC, "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
 
   /* sink pad */
-  pad_template = gst_static_pad_template_get (&gst_vaapipostproc_sink_factory);
-  gst_element_class_add_pad_template (element_class, pad_template);
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapipostproc_sink_factory);
 
   /* src pad */
-  pad_template = gst_static_pad_template_get (&gst_vaapipostproc_src_factory);
-  gst_element_class_add_pad_template (element_class, pad_template);
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapipostproc_src_factory);
 
   /**
    * GstVaapiPostproc:deinterlace-mode:
diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c
index cd19bc5abd..1af1aa2956 100644
--- a/gst/vaapi/gstvaapisink.c
+++ b/gst/vaapi/gstvaapisink.c
@@ -1703,7 +1703,6 @@ gst_vaapisink_class_init (GstVaapiSinkClass * klass)
   GstVideoSinkClass *const videosink_class = GST_VIDEO_SINK_CLASS (klass);
   GstVaapiPluginBaseClass *const base_plugin_class =
       GST_VAAPI_PLUGIN_BASE_CLASS (klass);
-  GstPadTemplate *pad_template;
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_vaapisink,
       GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
@@ -1734,8 +1733,8 @@ gst_vaapisink_class_init (GstVaapiSinkClass * klass)
       "VA-API sink", "Sink/Video", GST_PLUGIN_DESC,
       "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
 
-  pad_template = gst_static_pad_template_get (&gst_vaapisink_sink_factory);
-  gst_element_class_add_pad_template (element_class, pad_template);
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vaapisink_sink_factory);
 
   /**
    * GstVaapiSink:display: