diff --git a/gradle-c-plugin/03-executable/build.gradle b/gradle-c-plugin/03-executable/build.gradle
index 7cb348b..0d87b5f 100644
--- a/gradle-c-plugin/03-executable/build.gradle
+++ b/gradle-c-plugin/03-executable/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'c'
 
-executables {
-    main {
+model {
+    components {
+        main(NativeExecutableSpec) {
+            
+        }
     }
 }
-
diff --git a/gradle-c-plugin/04-visual-studio/build.gradle b/gradle-c-plugin/04-visual-studio/build.gradle
index 753a517..3ef557d 100644
--- a/gradle-c-plugin/04-visual-studio/build.gradle
+++ b/gradle-c-plugin/04-visual-studio/build.gradle
@@ -1,8 +1,11 @@
 apply plugin: 'c'
 apply plugin: 'visual-studio'
 
-executables {
-    main {
+model {
+    components {
+        main(NativeExecutableSpec) {
+            
+        }
     }
 }
 
diff --git a/gradle-c-plugin/05-debian-package/build.gradle b/gradle-c-plugin/05-debian-package/build.gradle
index c4f6766..ba4de10 100644
--- a/gradle-c-plugin/05-debian-package/build.gradle
+++ b/gradle-c-plugin/05-debian-package/build.gradle
@@ -1,45 +1,34 @@
-import org.gradle.api.publish.maven.MavenPublication
-buildscript {
-    repositories {
-        maven {
-            url "http://dl.bintray.com/gesellix/gradle-plugins"
-        }
-        mavenCentral()
-        mavenLocal()
-    }
-    dependencies {
-        classpath "de.gesellix:gradle-debian-plugin:12"
-    }
+plugins {
+  id "nebula.os-package" version "2.0.3"
 }
 
-apply plugin: 'maven'
-apply plugin: 'pkg-debian'
 apply plugin: 'c'
 
-version = "1.0.0"
-
-executables {
-    hello {
-    }
-}
-
-task prepare(type: Copy) {
-    description "Copy files to Linux directory layout"
-    from "build/binaries/helloExecutable"
-    into "build/linux/usr/bin"
-}
-
-debian {
-    packagename = "hello-fimuni"
-    publications = ['fimuni']
-    controlDirectory = "$projectDir/src/main/resources/control"
-    changelogFile = "$projectDir/src/main/resources/txt/changelog.txt"
-
-    data {
-        def baseDir = "$buildDir/linux"
-        dir {
-            name = baseDir
+model {
+    components {
+        hello(NativeExecutableSpec) {
+            
         }
     }
 }
 
+ospackage {
+    packageName = "hello"
+    version = "1.0"
+    release = 1
+    os = LINUX
+    packageDescription = "Linux Gradle hello package"
+    summary = "contains binary with hello world example"
+
+    from("build/binaries/helloExecutable") {
+        into "/usr/bin/"
+    }
+}
+
+buildDeb {
+    requires("libc6")
+}
+
+buildRpm {
+    requires("libc6")
+}
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/control/conffiles b/gradle-c-plugin/05-debian-package/src/main/resources/control/conffiles
deleted file mode 100644
index 92ab7db..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/control/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/default/hello-fimuni
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/control/control b/gradle-c-plugin/05-debian-package/src/main/resources/control/control
deleted file mode 100644
index a95cde9..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/control/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Source: hello-fimuni
-Section: web
-Priority: optional
-Version: 1.0.0
-Maintainer: Juraj Michalek <juraj.michalek@ysoft.com>
-Homepage: http://www.ysoft.com/
-Package: hello-fimuni
-Architecture: all
-Depends: 
-Description: Hello FI MUNI
- Example of Linux packaging for Gradle.
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/control/postinst b/gradle-c-plugin/05-debian-package/src/main/resources/control/postinst
deleted file mode 100644
index 595ce13..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/control/postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-
-# Post installation script - executed at the last phase of installation
-
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/control/postrm b/gradle-c-plugin/05-debian-package/src/main/resources/control/postrm
deleted file mode 100644
index d84b328..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/control/postrm
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-# Post remove script
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/control/prerm b/gradle-c-plugin/05-debian-package/src/main/resources/control/prerm
deleted file mode 100644
index 5931a63..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/control/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Pre-uninstallation script
-
diff --git a/gradle-c-plugin/05-debian-package/src/main/resources/txt/changelog.txt b/gradle-c-plugin/05-debian-package/src/main/resources/txt/changelog.txt
deleted file mode 100644
index 139597f..0000000
--- a/gradle-c-plugin/05-debian-package/src/main/resources/txt/changelog.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-