diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index 427c801953e..4adff8bb975 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -485,7 +485,6 @@ MACHINE_CONFIG_START(gluck2_state::gluck2)
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
 	MCFG_CPU_PROGRAM_MAP(gluck2_map)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", gluck2_state,  nmi_line_pulse)
 
 	MCFG_NVRAM_ADD_0FILL("nvram")
 
@@ -508,6 +507,7 @@ MACHINE_CONFIG_START(gluck2_state::gluck2)
 	MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/16) /* guess */
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
 	MCFG_MC6845_CHAR_WIDTH(8)
+	MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index 061a9e0462f..4ef71da9b55 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -491,7 +491,6 @@ MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk)
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", MC6809, MASTER_CLOCK)
 	MCFG_CPU_PROGRAM_MAP(mpu12wbk_map)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", mpu12wbk_state,  nmi_line_pulse)
 
 //  MCFG_NVRAM_ADD_0FILL("nvram")
 
@@ -511,6 +510,7 @@ MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk)
 	MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/4) /* guess */
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
 	MCFG_MC6845_CHAR_WIDTH(4)
+	MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp
index 1198a5a7da8..ccd8e1b3428 100644
--- a/src/mame/drivers/ssingles.cpp
+++ b/src/mame/drivers/ssingles.cpp
@@ -179,7 +179,7 @@ public:
 	DECLARE_CUSTOM_INPUT_MEMBER(controls_r);
 	DECLARE_DRIVER_INIT(ssingles);
 	virtual void video_start() override;
-	INTERRUPT_GEN_MEMBER(atamanot_irq);
+	DECLARE_WRITE_LINE_MEMBER(atamanot_irq);
 	MC6845_UPDATE_ROW(ssingles_update_row);
 	MC6845_UPDATE_ROW(atamanot_update_row);
 	required_device<cpu_device> m_maincpu;
@@ -551,7 +551,6 @@ MACHINE_CONFIG_START(ssingles_state::ssingles)
 	MCFG_CPU_ADD("maincpu", Z80,4000000)         /* ? MHz */
 	MCFG_CPU_PROGRAM_MAP(ssingles_map)
 	MCFG_CPU_IO_MAP(ssingles_io_map)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", ssingles_state,  nmi_line_pulse)
 
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256)   /* temporary, CRTC will configure screen */
@@ -565,6 +564,7 @@ MACHINE_CONFIG_START(ssingles_state::ssingles)
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
 	MCFG_MC6845_CHAR_WIDTH(8)
 	MCFG_MC6845_UPDATE_ROW_CB(ssingles_state, ssingles_update_row)
+	MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -577,7 +577,7 @@ MACHINE_CONFIG_START(ssingles_state::ssingles)
 
 MACHINE_CONFIG_END
 
-INTERRUPT_GEN_MEMBER(ssingles_state::atamanot_irq)
+WRITE_LINE_MEMBER(ssingles_state::atamanot_irq)
 {
 	// ...
 }
@@ -587,7 +587,6 @@ MACHINE_CONFIG_START(ssingles_state::atamanot)
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(atamanot_map)
 	MCFG_CPU_IO_MAP(atamanot_io_map)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", ssingles_state,  atamanot_irq)
 
 	MCFG_DEVICE_REMOVE("crtc")
 
@@ -595,6 +594,7 @@ MACHINE_CONFIG_START(ssingles_state::atamanot)
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
 	MCFG_MC6845_CHAR_WIDTH(8)
 	MCFG_MC6845_UPDATE_ROW_CB(ssingles_state, atamanot_update_row)
+	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(ssingles_state, atamanot_irq))
 
 	MCFG_GFXDECODE_MODIFY("gfxdecode", atamanot)
 MACHINE_CONFIG_END