The s-process nucleosynthesis in Asymptotic Giant Branch (AGB) stars depends on the modelling of convective boundaries. I present models and s-process simulations that adopt a treatment of convective boundaries based on the results of hydrodynamic simulations and on the theory of mixing due to gravity waves in the vicinity of convective boundaries. Hydrodynamics simulations suggest the presence of Convective Boundary Mixing (CBM) at the bottom of the thermal pulse-driven convective zone. Similarly, convection-induced mixing processes are proposed for the mixing below the convective envelope during Third Dredge-Up where the C13-pocket for the s-process in AGB stars forms. In this work I apply a CBM model motivated by simulations and theory to models with initial mass M = 2 and M = 3 solar masses , and with initial metal content Z = 0.01 and Z = 0.02. As reported previously, the He-intershell abundance of C12 and O16 are increased by CBM at the bottom of pulse-driven convection zone. This mixing is affecting the Ne22(gamma,n)Mg25 activation and the s-process efficiency in the C13-pocket. In our model CBM at the bottom of the convective envelope during the Third Dredge-Up represents gravity wave mixing. I take further into account that hydrodynamic simulations indicate a declining mixing efficiency already about a pressure scale height from the convective boundaries, compared to mixing-length theory. I obtain the formation of the C13-pocket with a mass of around e-4 solar masses. The final s-process abundances are characterized by 0.36 < [s/Fe] < 0.78 and the heavy-to-light s-process ratio is 0.23 < [hs/ls] < 0.45. Finally, I compare our results with stellar observations, pre-solar grain measurements.